diff --git a/DamageCalculator/.vs/DamageCalculator/v17/.suo b/DamageCalculator/.vs/DamageCalculator/v17/.suo
index 5b4821a..8bf2f4d 100644
Binary files a/DamageCalculator/.vs/DamageCalculator/v17/.suo and b/DamageCalculator/.vs/DamageCalculator/v17/.suo differ
diff --git a/DamageCalculator/DamageCalculator/Help.xaml b/DamageCalculator/DamageCalculator/Help.xaml
index 44f47d3..fa164ef 100644
--- a/DamageCalculator/DamageCalculator/Help.xaml
+++ b/DamageCalculator/DamageCalculator/Help.xaml
@@ -29,7 +29,7 @@
                 </StackPanel>
                 <StackPanel Margin="0,10,0,0">
                     <TextBlock Text="Map" FontSize="24" Foreground="#FF0093E0" />
-                    <TextBlock FontSize="16" Text="The map in the middle shows the general spawn areas and bomb sites defined in the text file, as well as spawn positions and directions from the map file. The middle of a spawn is bright, if it's a priority spawn, otherwise dark. All of these can be hidden in the 'View' menu on top, 2v2 spawns can be hidden separately, while all other spawn types are treated under 'general'. With a right click you set the first point on the map, and with a left click you set the second point, or the bomb position, depending on the mode. These are used to calculate damage on range. You can zoom with your mouse wheel, pan by holding spacebar while left click dragging, and reset the zoom by clicking down the mouse wheel." Margin="0,5,0,0" TextWrapping="Wrap" />
+                    <TextBlock FontSize="16" Text="The map in the middle shows the general spawn areas and bomb sites defined in the text file, as well as spawn positions and directions from the map file. The middle of a spawn is bright, if it's a priority spawn, otherwise dark, hostages however are filled with a red colour. All of these can be hidden in the 'View' menu on top, 2v2 spawns can be hidden separately, while all other spawn types are treated under 'general'. With a right click you set the first point on the map, and with a left click you set the second point, or the bomb position, depending on the mode. These are used to calculate damage on range. You can zoom with your mouse wheel, pan by holding spacebar while left click dragging, and reset the zoom by clicking down the mouse wheel." Margin="0,5,0,0" TextWrapping="Wrap" />
                 </StackPanel>
             </StackPanel>
         </ScrollViewer>
diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml b/DamageCalculator/DamageCalculator/MainWindow.xaml
index 0919c80..f2eba20 100644
--- a/DamageCalculator/DamageCalculator/MainWindow.xaml
+++ b/DamageCalculator/DamageCalculator/MainWindow.xaml
@@ -19,6 +19,7 @@
                 <MenuItem x:Name="mnuShowSpawnAreas" StaysOpenOnClick="True" Header="Show spawn areas" IsCheckable="True" IsChecked="True" Checked="visibilityMenu_CheckChanged" Unchecked="visibilityMenu_CheckChanged" />
                 <MenuItem x:Name="mnuShowStandardSpawns" StaysOpenOnClick="True" Header="Show standard spawns" IsCheckable="True" IsChecked="True" Checked="visibilityMenu_CheckChanged" Unchecked="visibilityMenu_CheckChanged" />
                 <MenuItem x:Name="mnuShow2v2Spawns" StaysOpenOnClick="True" Header="Show 2v2 spawns" IsCheckable="True" IsChecked="True" Checked="visibilityMenu_CheckChanged" Unchecked="visibilityMenu_CheckChanged" />
+                <MenuItem x:Name="mnuShowHostageSpawns" StaysOpenOnClick="True" Header="Show hostage spawns" IsCheckable="True" IsChecked="True" Checked="visibilityMenu_CheckChanged" Unchecked="visibilityMenu_CheckChanged" />
                 <MenuItem x:Name="mnuAllowNonPrioritySpawns" StaysOpenOnClick="True" Header="Allow non-priority spawns" IsCheckable="True" IsChecked="True" Checked="visibilityMenu_CheckChanged" Unchecked="visibilityMenu_CheckChanged" />
                 <MenuItem x:Name="mnuShowDrawnMarkers" StaysOpenOnClick="True" Header="Show drawn markers" IsCheckable="True" IsChecked="True" Checked="visibilityMenu_CheckChanged" Unchecked="visibilityMenu_CheckChanged" />
                 <Separator />
diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs
index 848cc53..d5d33e8 100644
--- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs
+++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs
@@ -334,6 +334,21 @@ namespace Damage_Calculator
 
                     map.SpawnPoints.Add(spawn);
                 }
+
+                if (className == "info_hostage_spawn" || className == "hostage_entity")
+                {
+                    // Entity is hostage spawn point (equivalent but latter is csgo specific)
+                    var spawn = new PlayerSpawn();
+                    spawn.Origin = this.stringToVector3(entityRootVdf["origin"]?.Value) ?? Vector3.Empty;
+                    spawn.Angles = this.stringToVector3(entityRootVdf["angles"]?.Value) ?? Vector3.Empty;
+
+                    // Count all hostage spawns
+                    map.AmountHostages++;
+
+                    spawn.Type = eSpawnType.Hostage;
+
+                    map.SpawnPoints.Add(spawn);
+                }
             }
         }
 
@@ -419,9 +434,15 @@ namespace Damage_Calculator
             spawnBlip.SetColour(blipColour);
             Color colourPriority = Color.FromArgb(150, 200, 200, 0);
             Color colourNoPriority = Color.FromArgb(150, 20, 20, 0);
+            Color colourHostage = Color.FromArgb(150, 255, 0, 0);
 
+            if(spawn.Type == eSpawnType.Hostage)
+            {
+                // This is a hostage, so fill it red
+                spawnBlip.SetEllipseFill(colourHostage);
+            }
             // If all are priority spawns, just mark all of them as low prio, for consistency
-            if (spawn.Team == ePlayerTeam.Terrorist && this.loadedMap.HasPrioritySpawnsT || spawn.Team == ePlayerTeam.CounterTerrorist && this.loadedMap.HasPrioritySpawnsCT)
+            else if (spawn.Team == ePlayerTeam.Terrorist && this.loadedMap.HasPrioritySpawnsT || spawn.Team == ePlayerTeam.CounterTerrorist && this.loadedMap.HasPrioritySpawnsCT)
             {
                 // This team has at least 1 priority spawn, so only colour the priority ones bright
                 spawnBlip.SetEllipseFill(spawn.IsPriority ? colourPriority : colourNoPriority);
@@ -530,12 +551,15 @@ namespace Damage_Calculator
                     continue;
                 else if (spawn.Type == eSpawnType.Wingman && mnuShow2v2Spawns.IsChecked == false)
                     continue;
+                else if (spawn.Type == eSpawnType.Hostage && mnuShowHostageSpawns.IsChecked == false)
+                    continue;
 
                 var existingViewBox = this.pointsCanvas.Children.OfType<Viewbox>().FirstOrDefault(v => v.Tag == spawn);
                 if (existingViewBox == null)
                 {
                     Viewbox box = new Viewbox();
 
+                    // Are viewboxes even needed?
                     var blipControl = this.getSpawnBlip(spawn);
                     box.Tag = spawn;
                     box.Child = blipControl;
diff --git a/DamageCalculator/DamageCalculator/Models/CsgoMap.cs b/DamageCalculator/DamageCalculator/Models/CsgoMap.cs
index 7e10de2..e88976d 100644
--- a/DamageCalculator/DamageCalculator/Models/CsgoMap.cs
+++ b/DamageCalculator/DamageCalculator/Models/CsgoMap.cs
@@ -131,6 +131,8 @@ namespace Damage_Calculator.Models
 
         public int AmountSpawnsT { get; set; }
 
+        public int AmountHostages { get; set; }
+
         public bool HasPrioritySpawnsT
         {
             get
diff --git a/DamageCalculator/DamageCalculator/Models/PlayerSpawn.cs b/DamageCalculator/DamageCalculator/Models/PlayerSpawn.cs
index 5000046..a052727 100644
--- a/DamageCalculator/DamageCalculator/Models/PlayerSpawn.cs
+++ b/DamageCalculator/DamageCalculator/Models/PlayerSpawn.cs
@@ -30,12 +30,27 @@ namespace Damage_Calculator.Models
         public Vector3 Angles { get; set; }
 
         /// <summary>
-        /// The type of spawn (standard, 2v2, ...)
+        /// The type of spawn (standard, 2v2, hostage, ...)
         /// </summary>
         public eSpawnType Type { get; set; }
     }
 
     public enum ePlayerTeam { Terrorist, CounterTerrorist }
 
-    public enum eSpawnType { Standard, Wingman }
+    public enum eSpawnType 
+    { 
+        /// <summary>
+        /// Standard spawnpoints, also including all types that are not separate otherwise.
+        /// </summary>
+        Standard, 
+
+        /// <summary>
+        /// A 2v2 spawn.
+        /// </summary>
+        Wingman, 
+
+        /// <summary>
+        /// A hostage spawn.
+        /// </summary>
+        Hostage }
 }
diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe
index cf6bdb5..c7dee8d 100644
Binary files a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe differ
diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb
index 504d388..db9c276 100644
Binary files a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb differ
diff --git a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe
index 30c4f59..f457db3 100644
Binary files a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe differ
diff --git a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb
index aa71aef..7d958bb 100644
Binary files a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb differ
diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe
index cf6bdb5..c7dee8d 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe differ
diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources
index e8b2d75..e4872da 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources differ
diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb
index 504d388..db9c276 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb differ
diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml
index af57770..78e85dd 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml and b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml differ
diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs
index 9c99c48..75377cf 100644
--- a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs
+++ b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8F0F0C852384FC12CF7097D055D1358868A336EC1A1243944432FCB4A124DD23"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8B56867D804DB77B31091EAB1DAB861F112C61A38874ACF36D4E0788B86393FC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -75,7 +75,7 @@ namespace Damage_Calculator {
         
         #line 22 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns;
+        internal System.Windows.Controls.MenuItem mnuShowHostageSpawns;
         
         #line default
         #line hidden
@@ -83,15 +83,15 @@ namespace Damage_Calculator {
         
         #line 23 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers;
+        internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns;
         
         #line default
         #line hidden
         
         
-        #line 31 "..\..\MainWindow.xaml"
+        #line 24 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuAbout;
+        internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers;
         
         #line default
         #line hidden
@@ -99,15 +99,15 @@ namespace Damage_Calculator {
         
         #line 32 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuHelp;
+        internal System.Windows.Controls.MenuItem mnuAbout;
         
         #line default
         #line hidden
         
         
-        #line 46 "..\..\MainWindow.xaml"
+        #line 33 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.RadioButton radioModeShooting;
+        internal System.Windows.Controls.MenuItem mnuHelp;
         
         #line default
         #line hidden
@@ -115,13 +115,21 @@ namespace Damage_Calculator {
         
         #line 47 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.RadioButton radioModeShooting;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 48 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioModeBomb;
         
         #line default
         #line hidden
         
         
-        #line 49 "..\..\MainWindow.xaml"
+        #line 50 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel topStackPanel;
         
@@ -129,7 +137,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 51 "..\..\MainWindow.xaml"
+        #line 52 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox comboBoxMaps;
         
@@ -137,7 +145,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 56 "..\..\MainWindow.xaml"
+        #line 57 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtEasterEggMetres;
         
@@ -145,7 +153,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 57 "..\..\MainWindow.xaml"
+        #line 58 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock textDistanceMetres;
         
@@ -153,7 +161,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 61 "..\..\MainWindow.xaml"
+        #line 62 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock textDistanceUnits;
         
@@ -161,7 +169,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 64 "..\..\MainWindow.xaml"
+        #line 65 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Shapes.Rectangle rectTop;
         
@@ -169,7 +177,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 65 "..\..\MainWindow.xaml"
+        #line 66 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Shapes.Rectangle rectSide;
         
@@ -177,7 +185,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 66 "..\..\MainWindow.xaml"
+        #line 67 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel leftStackPanel;
         
@@ -185,7 +193,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 70 "..\..\MainWindow.xaml"
+        #line 71 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackArmorSeparated;
         
@@ -193,7 +201,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 71 "..\..\MainWindow.xaml"
+        #line 72 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHelmet;
         
@@ -201,7 +209,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 72 "..\..\MainWindow.xaml"
+        #line 73 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkKevlar;
         
@@ -209,7 +217,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 74 "..\..\MainWindow.xaml"
+        #line 75 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkArmorAny;
         
@@ -217,7 +225,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 76 "..\..\MainWindow.xaml"
+        #line 77 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackAreaHit;
         
@@ -225,7 +233,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 78 "..\..\MainWindow.xaml"
+        #line 79 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioHead;
         
@@ -233,7 +241,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 79 "..\..\MainWindow.xaml"
+        #line 80 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioChestArms;
         
@@ -241,7 +249,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 80 "..\..\MainWindow.xaml"
+        #line 81 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioStomach;
         
@@ -249,7 +257,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 81 "..\..\MainWindow.xaml"
+        #line 82 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioLegs;
         
@@ -257,7 +265,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 83 "..\..\MainWindow.xaml"
+        #line 84 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackWeaponUsed;
         
@@ -265,7 +273,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 85 "..\..\MainWindow.xaml"
+        #line 86 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox comboWeapons;
         
@@ -273,7 +281,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 89 "..\..\MainWindow.xaml"
+        #line 90 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtResult;
         
@@ -281,7 +289,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 90 "..\..\MainWindow.xaml"
+        #line 91 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtResultArmor;
         
@@ -289,7 +297,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 97 "..\..\MainWindow.xaml"
+        #line 98 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHasMapFile;
         
@@ -297,7 +305,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 98 "..\..\MainWindow.xaml"
+        #line 99 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHasNavFile;
         
@@ -305,7 +313,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 101 "..\..\MainWindow.xaml"
+        #line 102 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtBombMaxDamage;
         
@@ -313,7 +321,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 105 "..\..\MainWindow.xaml"
+        #line 106 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtBombRadius;
         
@@ -321,7 +329,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 112 "..\..\MainWindow.xaml"
+        #line 113 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtCursorX;
         
@@ -329,7 +337,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 116 "..\..\MainWindow.xaml"
+        #line 117 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtCursorY;
         
@@ -337,7 +345,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 121 "..\..\MainWindow.xaml"
+        #line 122 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal Damage_Calculator.ZoomBorder rightZoomBorder;
         
@@ -345,7 +353,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 123 "..\..\MainWindow.xaml"
+        #line 124 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Image mapImage;
         
@@ -353,7 +361,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 124 "..\..\MainWindow.xaml"
+        #line 125 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Canvas pointsCanvas;
         
@@ -361,7 +369,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 128 "..\..\MainWindow.xaml"
+        #line 129 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Grid gridLoading;
         
@@ -486,39 +494,46 @@ namespace Damage_Calculator {
             #line hidden
             return;
             case 6:
-            this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuShowHostageSpawns = ((System.Windows.Controls.MenuItem)(target));
             
             #line 22 "..\..\MainWindow.xaml"
-            this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuShowHostageSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             
             #line 22 "..\..\MainWindow.xaml"
-            this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuShowHostageSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             return;
             case 7:
-            this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target));
             
             #line 23 "..\..\MainWindow.xaml"
-            this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             
             #line 23 "..\..\MainWindow.xaml"
-            this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             return;
             case 8:
+            this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 26 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click);
+            #line 24 "..\..\MainWindow.xaml"
+            this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\MainWindow.xaml"
+            this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
@@ -532,222 +547,230 @@ namespace Damage_Calculator {
             #line hidden
             return;
             case 10:
-            this.mnuAbout = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 31 "..\..\MainWindow.xaml"
-            this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click);
+            #line 28 "..\..\MainWindow.xaml"
+            ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click);
             
             #line default
             #line hidden
             return;
             case 11:
-            this.mnuHelp = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuAbout = ((System.Windows.Controls.MenuItem)(target));
             
             #line 32 "..\..\MainWindow.xaml"
-            this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click);
+            this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click);
             
             #line default
             #line hidden
             return;
             case 12:
-            this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target));
+            this.mnuHelp = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 46 "..\..\MainWindow.xaml"
-            this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked);
+            #line 33 "..\..\MainWindow.xaml"
+            this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click);
             
             #line default
             #line hidden
             return;
             case 13:
-            this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target));
+            this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target));
             
             #line 47 "..\..\MainWindow.xaml"
-            this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked);
+            this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked);
             
             #line default
             #line hidden
             return;
             case 14:
-            this.topStackPanel = ((System.Windows.Controls.StackPanel)(target));
+            this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target));
+            
+            #line 48 "..\..\MainWindow.xaml"
+            this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked);
+            
+            #line default
+            #line hidden
             return;
             case 15:
+            this.topStackPanel = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 16:
             this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 51 "..\..\MainWindow.xaml"
+            #line 52 "..\..\MainWindow.xaml"
             this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged);
             
             #line default
             #line hidden
             return;
-            case 16:
+            case 17:
             this.txtEasterEggMetres = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 17:
+            case 18:
             this.textDistanceMetres = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 18:
+            case 19:
             this.textDistanceUnits = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 19:
+            case 20:
             this.rectTop = ((System.Windows.Shapes.Rectangle)(target));
             return;
-            case 20:
+            case 21:
             this.rectSide = ((System.Windows.Shapes.Rectangle)(target));
             return;
-            case 21:
+            case 22:
             this.leftStackPanel = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 22:
+            case 23:
             this.stackArmorSeparated = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 23:
+            case 24:
             this.chkHelmet = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 71 "..\..\MainWindow.xaml"
+            #line 72 "..\..\MainWindow.xaml"
             this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 71 "..\..\MainWindow.xaml"
+            #line 72 "..\..\MainWindow.xaml"
             this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 24:
+            case 25:
             this.chkKevlar = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 72 "..\..\MainWindow.xaml"
+            #line 73 "..\..\MainWindow.xaml"
             this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 72 "..\..\MainWindow.xaml"
+            #line 73 "..\..\MainWindow.xaml"
             this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 25:
+            case 26:
             this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 74 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 74 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 26:
+            case 27:
             this.stackAreaHit = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 27:
+            case 28:
             this.radioHead = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 78 "..\..\MainWindow.xaml"
+            #line 79 "..\..\MainWindow.xaml"
             this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 28:
+            case 29:
             this.radioChestArms = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 79 "..\..\MainWindow.xaml"
+            #line 80 "..\..\MainWindow.xaml"
             this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 29:
+            case 30:
             this.radioStomach = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 80 "..\..\MainWindow.xaml"
+            #line 81 "..\..\MainWindow.xaml"
             this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 30:
+            case 31:
             this.radioLegs = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 81 "..\..\MainWindow.xaml"
+            #line 82 "..\..\MainWindow.xaml"
             this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 31:
+            case 32:
             this.stackWeaponUsed = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 32:
+            case 33:
             this.comboWeapons = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 85 "..\..\MainWindow.xaml"
+            #line 86 "..\..\MainWindow.xaml"
             this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged);
             
             #line default
             #line hidden
             return;
-            case 33:
+            case 34:
             this.txtResult = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 34:
+            case 35:
             this.txtResultArmor = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 35:
+            case 36:
             this.chkHasMapFile = ((System.Windows.Controls.CheckBox)(target));
             return;
-            case 36:
+            case 37:
             this.chkHasNavFile = ((System.Windows.Controls.CheckBox)(target));
             return;
-            case 37:
+            case 38:
             this.txtBombMaxDamage = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 38:
+            case 39:
             this.txtBombRadius = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 39:
+            case 40:
             this.txtCursorX = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 40:
+            case 41:
             this.txtCursorY = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 41:
+            case 42:
             this.rightZoomBorder = ((Damage_Calculator.ZoomBorder)(target));
             return;
-            case 42:
+            case 43:
             this.mapImage = ((System.Windows.Controls.Image)(target));
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp);
             
             #line default
             #line hidden
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp);
             
             #line default
             #line hidden
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated);
             
             #line default
             #line hidden
             return;
-            case 43:
+            case 44:
             this.pointsCanvas = ((System.Windows.Controls.Canvas)(target));
             return;
-            case 44:
+            case 45:
             this.gridLoading = ((System.Windows.Controls.Grid)(target));
             return;
             }
diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs
index 9c99c48..75377cf 100644
--- a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs
+++ b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8F0F0C852384FC12CF7097D055D1358868A336EC1A1243944432FCB4A124DD23"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8B56867D804DB77B31091EAB1DAB861F112C61A38874ACF36D4E0788B86393FC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -75,7 +75,7 @@ namespace Damage_Calculator {
         
         #line 22 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns;
+        internal System.Windows.Controls.MenuItem mnuShowHostageSpawns;
         
         #line default
         #line hidden
@@ -83,15 +83,15 @@ namespace Damage_Calculator {
         
         #line 23 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers;
+        internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns;
         
         #line default
         #line hidden
         
         
-        #line 31 "..\..\MainWindow.xaml"
+        #line 24 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuAbout;
+        internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers;
         
         #line default
         #line hidden
@@ -99,15 +99,15 @@ namespace Damage_Calculator {
         
         #line 32 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuHelp;
+        internal System.Windows.Controls.MenuItem mnuAbout;
         
         #line default
         #line hidden
         
         
-        #line 46 "..\..\MainWindow.xaml"
+        #line 33 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.RadioButton radioModeShooting;
+        internal System.Windows.Controls.MenuItem mnuHelp;
         
         #line default
         #line hidden
@@ -115,13 +115,21 @@ namespace Damage_Calculator {
         
         #line 47 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.RadioButton radioModeShooting;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 48 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioModeBomb;
         
         #line default
         #line hidden
         
         
-        #line 49 "..\..\MainWindow.xaml"
+        #line 50 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel topStackPanel;
         
@@ -129,7 +137,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 51 "..\..\MainWindow.xaml"
+        #line 52 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox comboBoxMaps;
         
@@ -137,7 +145,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 56 "..\..\MainWindow.xaml"
+        #line 57 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtEasterEggMetres;
         
@@ -145,7 +153,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 57 "..\..\MainWindow.xaml"
+        #line 58 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock textDistanceMetres;
         
@@ -153,7 +161,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 61 "..\..\MainWindow.xaml"
+        #line 62 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock textDistanceUnits;
         
@@ -161,7 +169,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 64 "..\..\MainWindow.xaml"
+        #line 65 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Shapes.Rectangle rectTop;
         
@@ -169,7 +177,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 65 "..\..\MainWindow.xaml"
+        #line 66 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Shapes.Rectangle rectSide;
         
@@ -177,7 +185,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 66 "..\..\MainWindow.xaml"
+        #line 67 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel leftStackPanel;
         
@@ -185,7 +193,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 70 "..\..\MainWindow.xaml"
+        #line 71 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackArmorSeparated;
         
@@ -193,7 +201,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 71 "..\..\MainWindow.xaml"
+        #line 72 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHelmet;
         
@@ -201,7 +209,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 72 "..\..\MainWindow.xaml"
+        #line 73 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkKevlar;
         
@@ -209,7 +217,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 74 "..\..\MainWindow.xaml"
+        #line 75 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkArmorAny;
         
@@ -217,7 +225,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 76 "..\..\MainWindow.xaml"
+        #line 77 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackAreaHit;
         
@@ -225,7 +233,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 78 "..\..\MainWindow.xaml"
+        #line 79 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioHead;
         
@@ -233,7 +241,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 79 "..\..\MainWindow.xaml"
+        #line 80 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioChestArms;
         
@@ -241,7 +249,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 80 "..\..\MainWindow.xaml"
+        #line 81 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioStomach;
         
@@ -249,7 +257,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 81 "..\..\MainWindow.xaml"
+        #line 82 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioLegs;
         
@@ -257,7 +265,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 83 "..\..\MainWindow.xaml"
+        #line 84 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackWeaponUsed;
         
@@ -265,7 +273,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 85 "..\..\MainWindow.xaml"
+        #line 86 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox comboWeapons;
         
@@ -273,7 +281,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 89 "..\..\MainWindow.xaml"
+        #line 90 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtResult;
         
@@ -281,7 +289,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 90 "..\..\MainWindow.xaml"
+        #line 91 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtResultArmor;
         
@@ -289,7 +297,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 97 "..\..\MainWindow.xaml"
+        #line 98 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHasMapFile;
         
@@ -297,7 +305,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 98 "..\..\MainWindow.xaml"
+        #line 99 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHasNavFile;
         
@@ -305,7 +313,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 101 "..\..\MainWindow.xaml"
+        #line 102 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtBombMaxDamage;
         
@@ -313,7 +321,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 105 "..\..\MainWindow.xaml"
+        #line 106 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtBombRadius;
         
@@ -321,7 +329,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 112 "..\..\MainWindow.xaml"
+        #line 113 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtCursorX;
         
@@ -329,7 +337,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 116 "..\..\MainWindow.xaml"
+        #line 117 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtCursorY;
         
@@ -337,7 +345,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 121 "..\..\MainWindow.xaml"
+        #line 122 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal Damage_Calculator.ZoomBorder rightZoomBorder;
         
@@ -345,7 +353,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 123 "..\..\MainWindow.xaml"
+        #line 124 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Image mapImage;
         
@@ -353,7 +361,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 124 "..\..\MainWindow.xaml"
+        #line 125 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Canvas pointsCanvas;
         
@@ -361,7 +369,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 128 "..\..\MainWindow.xaml"
+        #line 129 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Grid gridLoading;
         
@@ -486,39 +494,46 @@ namespace Damage_Calculator {
             #line hidden
             return;
             case 6:
-            this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuShowHostageSpawns = ((System.Windows.Controls.MenuItem)(target));
             
             #line 22 "..\..\MainWindow.xaml"
-            this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuShowHostageSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             
             #line 22 "..\..\MainWindow.xaml"
-            this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuShowHostageSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             return;
             case 7:
-            this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target));
             
             #line 23 "..\..\MainWindow.xaml"
-            this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             
             #line 23 "..\..\MainWindow.xaml"
-            this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             return;
             case 8:
+            this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 26 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click);
+            #line 24 "..\..\MainWindow.xaml"
+            this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\MainWindow.xaml"
+            this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
@@ -532,222 +547,230 @@ namespace Damage_Calculator {
             #line hidden
             return;
             case 10:
-            this.mnuAbout = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 31 "..\..\MainWindow.xaml"
-            this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click);
+            #line 28 "..\..\MainWindow.xaml"
+            ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click);
             
             #line default
             #line hidden
             return;
             case 11:
-            this.mnuHelp = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuAbout = ((System.Windows.Controls.MenuItem)(target));
             
             #line 32 "..\..\MainWindow.xaml"
-            this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click);
+            this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click);
             
             #line default
             #line hidden
             return;
             case 12:
-            this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target));
+            this.mnuHelp = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 46 "..\..\MainWindow.xaml"
-            this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked);
+            #line 33 "..\..\MainWindow.xaml"
+            this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click);
             
             #line default
             #line hidden
             return;
             case 13:
-            this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target));
+            this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target));
             
             #line 47 "..\..\MainWindow.xaml"
-            this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked);
+            this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked);
             
             #line default
             #line hidden
             return;
             case 14:
-            this.topStackPanel = ((System.Windows.Controls.StackPanel)(target));
+            this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target));
+            
+            #line 48 "..\..\MainWindow.xaml"
+            this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked);
+            
+            #line default
+            #line hidden
             return;
             case 15:
+            this.topStackPanel = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 16:
             this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 51 "..\..\MainWindow.xaml"
+            #line 52 "..\..\MainWindow.xaml"
             this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged);
             
             #line default
             #line hidden
             return;
-            case 16:
+            case 17:
             this.txtEasterEggMetres = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 17:
+            case 18:
             this.textDistanceMetres = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 18:
+            case 19:
             this.textDistanceUnits = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 19:
+            case 20:
             this.rectTop = ((System.Windows.Shapes.Rectangle)(target));
             return;
-            case 20:
+            case 21:
             this.rectSide = ((System.Windows.Shapes.Rectangle)(target));
             return;
-            case 21:
+            case 22:
             this.leftStackPanel = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 22:
+            case 23:
             this.stackArmorSeparated = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 23:
+            case 24:
             this.chkHelmet = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 71 "..\..\MainWindow.xaml"
+            #line 72 "..\..\MainWindow.xaml"
             this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 71 "..\..\MainWindow.xaml"
+            #line 72 "..\..\MainWindow.xaml"
             this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 24:
+            case 25:
             this.chkKevlar = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 72 "..\..\MainWindow.xaml"
+            #line 73 "..\..\MainWindow.xaml"
             this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 72 "..\..\MainWindow.xaml"
+            #line 73 "..\..\MainWindow.xaml"
             this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 25:
+            case 26:
             this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 74 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 74 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 26:
+            case 27:
             this.stackAreaHit = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 27:
+            case 28:
             this.radioHead = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 78 "..\..\MainWindow.xaml"
+            #line 79 "..\..\MainWindow.xaml"
             this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 28:
+            case 29:
             this.radioChestArms = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 79 "..\..\MainWindow.xaml"
+            #line 80 "..\..\MainWindow.xaml"
             this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 29:
+            case 30:
             this.radioStomach = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 80 "..\..\MainWindow.xaml"
+            #line 81 "..\..\MainWindow.xaml"
             this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 30:
+            case 31:
             this.radioLegs = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 81 "..\..\MainWindow.xaml"
+            #line 82 "..\..\MainWindow.xaml"
             this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 31:
+            case 32:
             this.stackWeaponUsed = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 32:
+            case 33:
             this.comboWeapons = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 85 "..\..\MainWindow.xaml"
+            #line 86 "..\..\MainWindow.xaml"
             this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged);
             
             #line default
             #line hidden
             return;
-            case 33:
+            case 34:
             this.txtResult = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 34:
+            case 35:
             this.txtResultArmor = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 35:
+            case 36:
             this.chkHasMapFile = ((System.Windows.Controls.CheckBox)(target));
             return;
-            case 36:
+            case 37:
             this.chkHasNavFile = ((System.Windows.Controls.CheckBox)(target));
             return;
-            case 37:
+            case 38:
             this.txtBombMaxDamage = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 38:
+            case 39:
             this.txtBombRadius = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 39:
+            case 40:
             this.txtCursorX = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 40:
+            case 41:
             this.txtCursorY = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 41:
+            case 42:
             this.rightZoomBorder = ((Damage_Calculator.ZoomBorder)(target));
             return;
-            case 42:
+            case 43:
             this.mapImage = ((System.Windows.Controls.Image)(target));
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp);
             
             #line default
             #line hidden
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp);
             
             #line default
             #line hidden
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated);
             
             #line default
             #line hidden
             return;
-            case 43:
+            case 44:
             this.pointsCanvas = ((System.Windows.Controls.Canvas)(target));
             return;
-            case 44:
+            case 45:
             this.gridLoading = ((System.Windows.Controls.Grid)(target));
             return;
             }
diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe
index 30c4f59..f457db3 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe differ
diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources
index 1c43a84..ee7febb 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources differ
diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb
index aa71aef..7d958bb 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb differ
diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.baml b/DamageCalculator/DamageCalculator/obj/Release/Help.baml
index b6551b1..beab066 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Release/Help.baml and b/DamageCalculator/DamageCalculator/obj/Release/Help.baml differ
diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs b/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs
index c9f8847..64a3703 100644
--- a/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs
+++ b/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CF02F48AC6AFCD67163F820051C38428BBB1384D24C7CE423D2B4F3FD2844568"
+#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "315BB8A752151A28FB840C01C842E1FDC350EDA4B2F1BB5B03A031E9F79A4275"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs
index c9f8847..64a3703 100644
--- a/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs
+++ b/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CF02F48AC6AFCD67163F820051C38428BBB1384D24C7CE423D2B4F3FD2844568"
+#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "315BB8A752151A28FB840C01C842E1FDC350EDA4B2F1BB5B03A031E9F79A4275"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml
index feecf11..5c3fa9f 100644
Binary files a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml and b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml differ
diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs
index 9c99c48..75377cf 100644
--- a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs
+++ b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8F0F0C852384FC12CF7097D055D1358868A336EC1A1243944432FCB4A124DD23"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8B56867D804DB77B31091EAB1DAB861F112C61A38874ACF36D4E0788B86393FC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -75,7 +75,7 @@ namespace Damage_Calculator {
         
         #line 22 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns;
+        internal System.Windows.Controls.MenuItem mnuShowHostageSpawns;
         
         #line default
         #line hidden
@@ -83,15 +83,15 @@ namespace Damage_Calculator {
         
         #line 23 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers;
+        internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns;
         
         #line default
         #line hidden
         
         
-        #line 31 "..\..\MainWindow.xaml"
+        #line 24 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuAbout;
+        internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers;
         
         #line default
         #line hidden
@@ -99,15 +99,15 @@ namespace Damage_Calculator {
         
         #line 32 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuHelp;
+        internal System.Windows.Controls.MenuItem mnuAbout;
         
         #line default
         #line hidden
         
         
-        #line 46 "..\..\MainWindow.xaml"
+        #line 33 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.RadioButton radioModeShooting;
+        internal System.Windows.Controls.MenuItem mnuHelp;
         
         #line default
         #line hidden
@@ -115,13 +115,21 @@ namespace Damage_Calculator {
         
         #line 47 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.RadioButton radioModeShooting;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 48 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioModeBomb;
         
         #line default
         #line hidden
         
         
-        #line 49 "..\..\MainWindow.xaml"
+        #line 50 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel topStackPanel;
         
@@ -129,7 +137,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 51 "..\..\MainWindow.xaml"
+        #line 52 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox comboBoxMaps;
         
@@ -137,7 +145,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 56 "..\..\MainWindow.xaml"
+        #line 57 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtEasterEggMetres;
         
@@ -145,7 +153,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 57 "..\..\MainWindow.xaml"
+        #line 58 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock textDistanceMetres;
         
@@ -153,7 +161,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 61 "..\..\MainWindow.xaml"
+        #line 62 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock textDistanceUnits;
         
@@ -161,7 +169,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 64 "..\..\MainWindow.xaml"
+        #line 65 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Shapes.Rectangle rectTop;
         
@@ -169,7 +177,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 65 "..\..\MainWindow.xaml"
+        #line 66 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Shapes.Rectangle rectSide;
         
@@ -177,7 +185,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 66 "..\..\MainWindow.xaml"
+        #line 67 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel leftStackPanel;
         
@@ -185,7 +193,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 70 "..\..\MainWindow.xaml"
+        #line 71 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackArmorSeparated;
         
@@ -193,7 +201,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 71 "..\..\MainWindow.xaml"
+        #line 72 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHelmet;
         
@@ -201,7 +209,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 72 "..\..\MainWindow.xaml"
+        #line 73 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkKevlar;
         
@@ -209,7 +217,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 74 "..\..\MainWindow.xaml"
+        #line 75 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkArmorAny;
         
@@ -217,7 +225,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 76 "..\..\MainWindow.xaml"
+        #line 77 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackAreaHit;
         
@@ -225,7 +233,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 78 "..\..\MainWindow.xaml"
+        #line 79 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioHead;
         
@@ -233,7 +241,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 79 "..\..\MainWindow.xaml"
+        #line 80 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioChestArms;
         
@@ -241,7 +249,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 80 "..\..\MainWindow.xaml"
+        #line 81 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioStomach;
         
@@ -249,7 +257,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 81 "..\..\MainWindow.xaml"
+        #line 82 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioLegs;
         
@@ -257,7 +265,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 83 "..\..\MainWindow.xaml"
+        #line 84 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackWeaponUsed;
         
@@ -265,7 +273,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 85 "..\..\MainWindow.xaml"
+        #line 86 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox comboWeapons;
         
@@ -273,7 +281,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 89 "..\..\MainWindow.xaml"
+        #line 90 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtResult;
         
@@ -281,7 +289,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 90 "..\..\MainWindow.xaml"
+        #line 91 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtResultArmor;
         
@@ -289,7 +297,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 97 "..\..\MainWindow.xaml"
+        #line 98 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHasMapFile;
         
@@ -297,7 +305,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 98 "..\..\MainWindow.xaml"
+        #line 99 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHasNavFile;
         
@@ -305,7 +313,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 101 "..\..\MainWindow.xaml"
+        #line 102 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtBombMaxDamage;
         
@@ -313,7 +321,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 105 "..\..\MainWindow.xaml"
+        #line 106 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtBombRadius;
         
@@ -321,7 +329,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 112 "..\..\MainWindow.xaml"
+        #line 113 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtCursorX;
         
@@ -329,7 +337,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 116 "..\..\MainWindow.xaml"
+        #line 117 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtCursorY;
         
@@ -337,7 +345,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 121 "..\..\MainWindow.xaml"
+        #line 122 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal Damage_Calculator.ZoomBorder rightZoomBorder;
         
@@ -345,7 +353,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 123 "..\..\MainWindow.xaml"
+        #line 124 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Image mapImage;
         
@@ -353,7 +361,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 124 "..\..\MainWindow.xaml"
+        #line 125 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Canvas pointsCanvas;
         
@@ -361,7 +369,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 128 "..\..\MainWindow.xaml"
+        #line 129 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Grid gridLoading;
         
@@ -486,39 +494,46 @@ namespace Damage_Calculator {
             #line hidden
             return;
             case 6:
-            this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuShowHostageSpawns = ((System.Windows.Controls.MenuItem)(target));
             
             #line 22 "..\..\MainWindow.xaml"
-            this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuShowHostageSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             
             #line 22 "..\..\MainWindow.xaml"
-            this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuShowHostageSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             return;
             case 7:
-            this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target));
             
             #line 23 "..\..\MainWindow.xaml"
-            this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             
             #line 23 "..\..\MainWindow.xaml"
-            this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             return;
             case 8:
+            this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 26 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click);
+            #line 24 "..\..\MainWindow.xaml"
+            this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\MainWindow.xaml"
+            this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
@@ -532,222 +547,230 @@ namespace Damage_Calculator {
             #line hidden
             return;
             case 10:
-            this.mnuAbout = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 31 "..\..\MainWindow.xaml"
-            this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click);
+            #line 28 "..\..\MainWindow.xaml"
+            ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click);
             
             #line default
             #line hidden
             return;
             case 11:
-            this.mnuHelp = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuAbout = ((System.Windows.Controls.MenuItem)(target));
             
             #line 32 "..\..\MainWindow.xaml"
-            this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click);
+            this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click);
             
             #line default
             #line hidden
             return;
             case 12:
-            this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target));
+            this.mnuHelp = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 46 "..\..\MainWindow.xaml"
-            this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked);
+            #line 33 "..\..\MainWindow.xaml"
+            this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click);
             
             #line default
             #line hidden
             return;
             case 13:
-            this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target));
+            this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target));
             
             #line 47 "..\..\MainWindow.xaml"
-            this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked);
+            this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked);
             
             #line default
             #line hidden
             return;
             case 14:
-            this.topStackPanel = ((System.Windows.Controls.StackPanel)(target));
+            this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target));
+            
+            #line 48 "..\..\MainWindow.xaml"
+            this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked);
+            
+            #line default
+            #line hidden
             return;
             case 15:
+            this.topStackPanel = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 16:
             this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 51 "..\..\MainWindow.xaml"
+            #line 52 "..\..\MainWindow.xaml"
             this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged);
             
             #line default
             #line hidden
             return;
-            case 16:
+            case 17:
             this.txtEasterEggMetres = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 17:
+            case 18:
             this.textDistanceMetres = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 18:
+            case 19:
             this.textDistanceUnits = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 19:
+            case 20:
             this.rectTop = ((System.Windows.Shapes.Rectangle)(target));
             return;
-            case 20:
+            case 21:
             this.rectSide = ((System.Windows.Shapes.Rectangle)(target));
             return;
-            case 21:
+            case 22:
             this.leftStackPanel = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 22:
+            case 23:
             this.stackArmorSeparated = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 23:
+            case 24:
             this.chkHelmet = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 71 "..\..\MainWindow.xaml"
+            #line 72 "..\..\MainWindow.xaml"
             this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 71 "..\..\MainWindow.xaml"
+            #line 72 "..\..\MainWindow.xaml"
             this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 24:
+            case 25:
             this.chkKevlar = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 72 "..\..\MainWindow.xaml"
+            #line 73 "..\..\MainWindow.xaml"
             this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 72 "..\..\MainWindow.xaml"
+            #line 73 "..\..\MainWindow.xaml"
             this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 25:
+            case 26:
             this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 74 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 74 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 26:
+            case 27:
             this.stackAreaHit = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 27:
+            case 28:
             this.radioHead = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 78 "..\..\MainWindow.xaml"
+            #line 79 "..\..\MainWindow.xaml"
             this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 28:
+            case 29:
             this.radioChestArms = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 79 "..\..\MainWindow.xaml"
+            #line 80 "..\..\MainWindow.xaml"
             this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 29:
+            case 30:
             this.radioStomach = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 80 "..\..\MainWindow.xaml"
+            #line 81 "..\..\MainWindow.xaml"
             this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 30:
+            case 31:
             this.radioLegs = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 81 "..\..\MainWindow.xaml"
+            #line 82 "..\..\MainWindow.xaml"
             this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 31:
+            case 32:
             this.stackWeaponUsed = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 32:
+            case 33:
             this.comboWeapons = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 85 "..\..\MainWindow.xaml"
+            #line 86 "..\..\MainWindow.xaml"
             this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged);
             
             #line default
             #line hidden
             return;
-            case 33:
+            case 34:
             this.txtResult = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 34:
+            case 35:
             this.txtResultArmor = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 35:
+            case 36:
             this.chkHasMapFile = ((System.Windows.Controls.CheckBox)(target));
             return;
-            case 36:
+            case 37:
             this.chkHasNavFile = ((System.Windows.Controls.CheckBox)(target));
             return;
-            case 37:
+            case 38:
             this.txtBombMaxDamage = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 38:
+            case 39:
             this.txtBombRadius = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 39:
+            case 40:
             this.txtCursorX = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 40:
+            case 41:
             this.txtCursorY = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 41:
+            case 42:
             this.rightZoomBorder = ((Damage_Calculator.ZoomBorder)(target));
             return;
-            case 42:
+            case 43:
             this.mapImage = ((System.Windows.Controls.Image)(target));
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp);
             
             #line default
             #line hidden
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp);
             
             #line default
             #line hidden
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated);
             
             #line default
             #line hidden
             return;
-            case 43:
+            case 44:
             this.pointsCanvas = ((System.Windows.Controls.Canvas)(target));
             return;
-            case 44:
+            case 45:
             this.gridLoading = ((System.Windows.Controls.Grid)(target));
             return;
             }
diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs
index 9c99c48..75377cf 100644
--- a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs
+++ b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8F0F0C852384FC12CF7097D055D1358868A336EC1A1243944432FCB4A124DD23"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8B56867D804DB77B31091EAB1DAB861F112C61A38874ACF36D4E0788B86393FC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -75,7 +75,7 @@ namespace Damage_Calculator {
         
         #line 22 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns;
+        internal System.Windows.Controls.MenuItem mnuShowHostageSpawns;
         
         #line default
         #line hidden
@@ -83,15 +83,15 @@ namespace Damage_Calculator {
         
         #line 23 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers;
+        internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns;
         
         #line default
         #line hidden
         
         
-        #line 31 "..\..\MainWindow.xaml"
+        #line 24 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuAbout;
+        internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers;
         
         #line default
         #line hidden
@@ -99,15 +99,15 @@ namespace Damage_Calculator {
         
         #line 32 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem mnuHelp;
+        internal System.Windows.Controls.MenuItem mnuAbout;
         
         #line default
         #line hidden
         
         
-        #line 46 "..\..\MainWindow.xaml"
+        #line 33 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.RadioButton radioModeShooting;
+        internal System.Windows.Controls.MenuItem mnuHelp;
         
         #line default
         #line hidden
@@ -115,13 +115,21 @@ namespace Damage_Calculator {
         
         #line 47 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.RadioButton radioModeShooting;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 48 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioModeBomb;
         
         #line default
         #line hidden
         
         
-        #line 49 "..\..\MainWindow.xaml"
+        #line 50 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel topStackPanel;
         
@@ -129,7 +137,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 51 "..\..\MainWindow.xaml"
+        #line 52 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox comboBoxMaps;
         
@@ -137,7 +145,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 56 "..\..\MainWindow.xaml"
+        #line 57 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtEasterEggMetres;
         
@@ -145,7 +153,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 57 "..\..\MainWindow.xaml"
+        #line 58 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock textDistanceMetres;
         
@@ -153,7 +161,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 61 "..\..\MainWindow.xaml"
+        #line 62 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock textDistanceUnits;
         
@@ -161,7 +169,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 64 "..\..\MainWindow.xaml"
+        #line 65 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Shapes.Rectangle rectTop;
         
@@ -169,7 +177,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 65 "..\..\MainWindow.xaml"
+        #line 66 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Shapes.Rectangle rectSide;
         
@@ -177,7 +185,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 66 "..\..\MainWindow.xaml"
+        #line 67 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel leftStackPanel;
         
@@ -185,7 +193,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 70 "..\..\MainWindow.xaml"
+        #line 71 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackArmorSeparated;
         
@@ -193,7 +201,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 71 "..\..\MainWindow.xaml"
+        #line 72 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHelmet;
         
@@ -201,7 +209,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 72 "..\..\MainWindow.xaml"
+        #line 73 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkKevlar;
         
@@ -209,7 +217,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 74 "..\..\MainWindow.xaml"
+        #line 75 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkArmorAny;
         
@@ -217,7 +225,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 76 "..\..\MainWindow.xaml"
+        #line 77 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackAreaHit;
         
@@ -225,7 +233,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 78 "..\..\MainWindow.xaml"
+        #line 79 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioHead;
         
@@ -233,7 +241,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 79 "..\..\MainWindow.xaml"
+        #line 80 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioChestArms;
         
@@ -241,7 +249,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 80 "..\..\MainWindow.xaml"
+        #line 81 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioStomach;
         
@@ -249,7 +257,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 81 "..\..\MainWindow.xaml"
+        #line 82 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton radioLegs;
         
@@ -257,7 +265,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 83 "..\..\MainWindow.xaml"
+        #line 84 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel stackWeaponUsed;
         
@@ -265,7 +273,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 85 "..\..\MainWindow.xaml"
+        #line 86 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox comboWeapons;
         
@@ -273,7 +281,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 89 "..\..\MainWindow.xaml"
+        #line 90 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtResult;
         
@@ -281,7 +289,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 90 "..\..\MainWindow.xaml"
+        #line 91 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtResultArmor;
         
@@ -289,7 +297,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 97 "..\..\MainWindow.xaml"
+        #line 98 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHasMapFile;
         
@@ -297,7 +305,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 98 "..\..\MainWindow.xaml"
+        #line 99 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox chkHasNavFile;
         
@@ -305,7 +313,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 101 "..\..\MainWindow.xaml"
+        #line 102 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtBombMaxDamage;
         
@@ -313,7 +321,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 105 "..\..\MainWindow.xaml"
+        #line 106 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtBombRadius;
         
@@ -321,7 +329,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 112 "..\..\MainWindow.xaml"
+        #line 113 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtCursorX;
         
@@ -329,7 +337,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 116 "..\..\MainWindow.xaml"
+        #line 117 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtCursorY;
         
@@ -337,7 +345,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 121 "..\..\MainWindow.xaml"
+        #line 122 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal Damage_Calculator.ZoomBorder rightZoomBorder;
         
@@ -345,7 +353,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 123 "..\..\MainWindow.xaml"
+        #line 124 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Image mapImage;
         
@@ -353,7 +361,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 124 "..\..\MainWindow.xaml"
+        #line 125 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Canvas pointsCanvas;
         
@@ -361,7 +369,7 @@ namespace Damage_Calculator {
         #line hidden
         
         
-        #line 128 "..\..\MainWindow.xaml"
+        #line 129 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Grid gridLoading;
         
@@ -486,39 +494,46 @@ namespace Damage_Calculator {
             #line hidden
             return;
             case 6:
-            this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuShowHostageSpawns = ((System.Windows.Controls.MenuItem)(target));
             
             #line 22 "..\..\MainWindow.xaml"
-            this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuShowHostageSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             
             #line 22 "..\..\MainWindow.xaml"
-            this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuShowHostageSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             return;
             case 7:
-            this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target));
             
             #line 23 "..\..\MainWindow.xaml"
-            this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             
             #line 23 "..\..\MainWindow.xaml"
-            this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
             return;
             case 8:
+            this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 26 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click);
+            #line 24 "..\..\MainWindow.xaml"
+            this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\MainWindow.xaml"
+            this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged);
             
             #line default
             #line hidden
@@ -532,222 +547,230 @@ namespace Damage_Calculator {
             #line hidden
             return;
             case 10:
-            this.mnuAbout = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 31 "..\..\MainWindow.xaml"
-            this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click);
+            #line 28 "..\..\MainWindow.xaml"
+            ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click);
             
             #line default
             #line hidden
             return;
             case 11:
-            this.mnuHelp = ((System.Windows.Controls.MenuItem)(target));
+            this.mnuAbout = ((System.Windows.Controls.MenuItem)(target));
             
             #line 32 "..\..\MainWindow.xaml"
-            this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click);
+            this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click);
             
             #line default
             #line hidden
             return;
             case 12:
-            this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target));
+            this.mnuHelp = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 46 "..\..\MainWindow.xaml"
-            this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked);
+            #line 33 "..\..\MainWindow.xaml"
+            this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click);
             
             #line default
             #line hidden
             return;
             case 13:
-            this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target));
+            this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target));
             
             #line 47 "..\..\MainWindow.xaml"
-            this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked);
+            this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked);
             
             #line default
             #line hidden
             return;
             case 14:
-            this.topStackPanel = ((System.Windows.Controls.StackPanel)(target));
+            this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target));
+            
+            #line 48 "..\..\MainWindow.xaml"
+            this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked);
+            
+            #line default
+            #line hidden
             return;
             case 15:
+            this.topStackPanel = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 16:
             this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 51 "..\..\MainWindow.xaml"
+            #line 52 "..\..\MainWindow.xaml"
             this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged);
             
             #line default
             #line hidden
             return;
-            case 16:
+            case 17:
             this.txtEasterEggMetres = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 17:
+            case 18:
             this.textDistanceMetres = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 18:
+            case 19:
             this.textDistanceUnits = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 19:
+            case 20:
             this.rectTop = ((System.Windows.Shapes.Rectangle)(target));
             return;
-            case 20:
+            case 21:
             this.rectSide = ((System.Windows.Shapes.Rectangle)(target));
             return;
-            case 21:
+            case 22:
             this.leftStackPanel = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 22:
+            case 23:
             this.stackArmorSeparated = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 23:
+            case 24:
             this.chkHelmet = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 71 "..\..\MainWindow.xaml"
+            #line 72 "..\..\MainWindow.xaml"
             this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 71 "..\..\MainWindow.xaml"
+            #line 72 "..\..\MainWindow.xaml"
             this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 24:
+            case 25:
             this.chkKevlar = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 72 "..\..\MainWindow.xaml"
+            #line 73 "..\..\MainWindow.xaml"
             this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 72 "..\..\MainWindow.xaml"
+            #line 73 "..\..\MainWindow.xaml"
             this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 25:
+            case 26:
             this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target));
             
-            #line 74 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             
-            #line 74 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 26:
+            case 27:
             this.stackAreaHit = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 27:
+            case 28:
             this.radioHead = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 78 "..\..\MainWindow.xaml"
+            #line 79 "..\..\MainWindow.xaml"
             this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 28:
+            case 29:
             this.radioChestArms = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 79 "..\..\MainWindow.xaml"
+            #line 80 "..\..\MainWindow.xaml"
             this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 29:
+            case 30:
             this.radioStomach = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 80 "..\..\MainWindow.xaml"
+            #line 81 "..\..\MainWindow.xaml"
             this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 30:
+            case 31:
             this.radioLegs = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 81 "..\..\MainWindow.xaml"
+            #line 82 "..\..\MainWindow.xaml"
             this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated);
             
             #line default
             #line hidden
             return;
-            case 31:
+            case 32:
             this.stackWeaponUsed = ((System.Windows.Controls.StackPanel)(target));
             return;
-            case 32:
+            case 33:
             this.comboWeapons = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 85 "..\..\MainWindow.xaml"
+            #line 86 "..\..\MainWindow.xaml"
             this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged);
             
             #line default
             #line hidden
             return;
-            case 33:
+            case 34:
             this.txtResult = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 34:
+            case 35:
             this.txtResultArmor = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 35:
+            case 36:
             this.chkHasMapFile = ((System.Windows.Controls.CheckBox)(target));
             return;
-            case 36:
+            case 37:
             this.chkHasNavFile = ((System.Windows.Controls.CheckBox)(target));
             return;
-            case 37:
+            case 38:
             this.txtBombMaxDamage = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 38:
+            case 39:
             this.txtBombRadius = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 39:
+            case 40:
             this.txtCursorX = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 40:
+            case 41:
             this.txtCursorY = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 41:
+            case 42:
             this.rightZoomBorder = ((Damage_Calculator.ZoomBorder)(target));
             return;
-            case 42:
+            case 43:
             this.mapImage = ((System.Windows.Controls.Image)(target));
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp);
             
             #line default
             #line hidden
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp);
             
             #line default
             #line hidden
             
-            #line 123 "..\..\MainWindow.xaml"
+            #line 124 "..\..\MainWindow.xaml"
             this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated);
             
             #line default
             #line hidden
             return;
-            case 43:
+            case 44:
             this.pointsCanvas = ((System.Windows.Controls.Canvas)(target));
             return;
-            case 44:
+            case 45:
             this.gridLoading = ((System.Windows.Controls.Grid)(target));
             return;
             }