From 143b77fbf631ffcdec701d80bbd8ae6dd2f010a1 Mon Sep 17 00:00:00 2001
From: Steve Sharp <steve@bitbaboon.net>
Date: Tue, 12 May 2020 18:49:52 +0100
Subject: [PATCH] Fix for Intel Size New Jump bridge list New jump bridge
 functionality (recalc, remove, disable) jump bridge re-calc on delete /
 diable of JB Disabled jump bridge colour

---
 EVEData/JumpBridge.cs     |  34 ++-
 EVEData/LocalCharacter.cs |   9 +-
 EVEData/Navigation.cs     |  16 +-
 MainWindow.xaml           | 472 +++++++++++++++++++-------------------
 MainWindow.xaml.cs        |  67 +++++-
 MapColours.cs             |   5 +
 MapConfig.cs              |   1 +
 RegionControl.xaml.cs     |  28 ++-
 8 files changed, 382 insertions(+), 250 deletions(-)

diff --git a/EVEData/JumpBridge.cs b/EVEData/JumpBridge.cs
index 77f71631..4e043995 100644
--- a/EVEData/JumpBridge.cs
+++ b/EVEData/JumpBridge.cs
@@ -2,12 +2,15 @@
 // Jump Bridge
 //-----------------------------------------------------------------------
 
+using System.ComponentModel;
+using System.Xml.Serialization;
+
 namespace SMT.EVEData
 {
     /// <summary>
     /// A Player owned link between systems
     /// </summary>
-    public class JumpBridge
+    public class JumpBridge : INotifyPropertyChanged
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JumpBridge" /> class.
@@ -28,7 +31,24 @@ public JumpBridge(string f, string t)
         }
 
 
-       
+        private bool m_Disabled;
+
+        [XmlIgnoreAttribute]
+        public bool Disabled
+        {
+            get
+            {
+                return m_Disabled;
+            }
+            set
+            {
+                m_Disabled = value;
+
+                OnPropertyChanged("Disabled");
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
 
 
         /// <summary>
@@ -55,5 +75,15 @@ public override string ToString()
         {
             return $"{From} <==> {To}";
         }
+
+
+        protected void OnPropertyChanged(string name)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null)
+            {
+                handler(this, new PropertyChangedEventArgs(name));
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/EVEData/LocalCharacter.cs b/EVEData/LocalCharacter.cs
index 7f53f4d8..a2c92783 100644
--- a/EVEData/LocalCharacter.cs
+++ b/EVEData/LocalCharacter.cs
@@ -310,7 +310,12 @@ public async Task<List<JumpBridge>> FindJumpGates(string JumpBridgeFilterString
             return jbl;
         }
 
- 
+        public void RecalcRoute()
+        {
+            routeNeedsUpdate = true;
+            esiRouteNeedsUpdate = true;
+        }
+
         public string GetWayPointText()
         {
             string ClipboardText = "Waypoints\n==============\n";
@@ -506,7 +511,7 @@ private async void UpdateActiveRoute()
                     ActiveRoute.Clear();
                 }), DispatcherPriority.Normal);
 
-                // loop through all the waypoints and query ESI for the route
+                // loop through all the waypoints 
                 for (int i = 0; i < Waypoints.Count; i++)
                 {
                     start = end;
diff --git a/EVEData/Navigation.cs b/EVEData/Navigation.cs
index 158514d2..f986e529 100644
--- a/EVEData/Navigation.cs
+++ b/EVEData/Navigation.cs
@@ -103,11 +103,7 @@ public static void InitNavigation(List<System> eveSystems, List<JumpBridge> jump
                 MapNodes[mn.Name] = mn;
             }
 
-            foreach (JumpBridge jb in jumpBridges)
-            {
-                MapNodes[jb.From].JBConnection = jb.To;
-                MapNodes[jb.To].JBConnection = jb.From;
-            }
+            UpdateJumpBridges(jumpBridges);
 
             double MaxRange = 10 * 9460730472580800.0;
 
@@ -399,15 +395,13 @@ public static void UpdateJumpBridges(List<JumpBridge> jumpBridges)
         {
             foreach (JumpBridge jb in jumpBridges)
             {
-                if (jb.FromID != 0)
+                if(jb.Disabled)
                 {
-                    MapNodes[jb.From].JBConnection = jb.To;
+                    continue;
                 }
 
-                if (jb.ToID != 0)
-                {
-                    MapNodes[jb.To].JBConnection = jb.From;
-                }
+                MapNodes[jb.From].JBConnection = jb.To;
+                MapNodes[jb.To].JBConnection = jb.From;
             }
         }
 
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 5a4a98ab..7d17c578 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="SMT.MainWindow"
+<Window
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -12,13 +12,14 @@
         xmlns:xcadl="clr-namespace:AvalonDock.Layout;assembly=AvalonDock"
         xmlns:xcadt="clr-namespace:AvalonDock.Themes;assembly=AvalonDock.Themes.Expression"
         xmlns:diag="clr-namespace:System.Diagnostics;assembly=WindowsBase"
+        xmlns:Themes="clr-namespace:Xceed.Wpf.Toolkit.Themes;assembly=DotNetProjects.Wpf.Extended.Toolkit" x:Class="SMT.MainWindow"
         mc:Ignorable="d"
         Title="SMT" Height="850" Width="1124" Icon="smt_bomb_icon.ico" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip">
 
     <Window.Resources>
 
         <local:ZKBBackgroundConverter x:Key="zkbBGConverter" />
-            
+
         <ObjectDataProvider x:Key="navigationEnumData" MethodName="GetValues" ObjectType="{x:Type System:Enum}">
             <ObjectDataProvider.MethodParameters>
                 <x:Type TypeName="local:RoutingMode" />
@@ -27,10 +28,8 @@
 
         <DataTemplate x:Key="intelDataDataTemplate">
             <DockPanel >
-                <TextBlock Text="{Binding Path=IntelTime, StringFormat='HH:mm', FallbackValue='TIME'}" Foreground="Yellow" Padding="0,0,5,0" TextBlock.FontSize="{Binding RelativeSource={RelativeSource FindAncestor, 
-AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
-                <TextBlock Text="{Binding Path=IntelString, FallbackValue='Intel Data'}" Foreground="White" TextWrapping="WrapWithOverflow" TextBlock.FontSize="{Binding RelativeSource={RelativeSource FindAncestor, 
-AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
+                <TextBlock Text="{Binding IntelTime, FallbackValue=TIME, StringFormat=HH:mm}" Foreground="Yellow" Padding="0,0,5,0" TextBlock.FontSize="{Binding MapConf.IntelTextSize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+                <TextBlock Text="{Binding IntelString, FallbackValue=Intel Data}" Foreground="White" TextWrapping="WrapWithOverflow" TextBlock.FontSize="{Binding MapConf.IntelTextSize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
             </DockPanel>
         </DataTemplate>
 
@@ -38,7 +37,7 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
 
     </Window.Resources>
 
-    
+
     <DockPanel>
 
         <Menu DockPanel.Dock="Top">
@@ -59,27 +58,27 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
         </Menu>
         <StatusBar x:Name="AppStatusBar" DockPanel.Dock="Bottom">
             <StatusBarItem>
-                <TextBlock>EVE Time :</TextBlock>
+                <TextBlock><Run Text="EVE Time :"/></TextBlock>
             </StatusBarItem>
 
             <StatusBarItem>
-                <TextBlock Text="{Binding Path=ServerTime, StringFormat=HH:mm}" Foreground="White" />
+                <TextBlock Text="{Binding ServerTime, StringFormat=HH:mm}" Foreground="White" />
             </StatusBarItem>
 
             <Separator />
 
             <StatusBarItem>
-                <TextBlock>Tranquility Version:</TextBlock>
+                <TextBlock><Run Text="Tranquility Version:"/></TextBlock>
             </StatusBarItem>
 
             <StatusBarItem>
-                <TextBlock Text="{Binding Path=ServerVersion}" Foreground="White"/>
+                <TextBlock Text="{Binding ServerVersion}" Foreground="White"/>
             </StatusBarItem>
 
             <Separator />
 
             <StatusBarItem>
-                <TextBlock Text="{Binding Path=NumPlayers}" Foreground="White"/>
+                <TextBlock Text="{Binding NumPlayers}" Foreground="White"/>
             </StatusBarItem>
 
             <StatusBarItem >
@@ -92,211 +91,6 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
             </xcad:DockingManager.Theme>
 
             <xcadl:LayoutRoot>
-                <xcadl:LayoutRoot.RootPanel>
-                    <xcadl:LayoutPanel>
-                        <xcadl:LayoutAnchorablePaneGroup DockWidth="250" DockMinWidth="250" Orientation="Vertical">
-                            <xcadl:LayoutAnchorablePane>
-                                <xcadl:LayoutAnchorable x:Name="ZKBLayoutAnchorable"  Title="ZKB Feed" CanClose="False" CanAutoHide="True" CanHide="False" ContentId="ZKBContentID" AutoHideMinHeight="200" AutoHideMinWidth="280">
-                                    <Grid>
-                                        <ScrollViewer Background="{DynamicResource ButtonBackground}">
-                                            <StackPanel CanVerticallyScroll="True" ScrollViewer.CanContentScroll="True">
-                                                <CheckBox Content="Selected Region Only" x:Name="ZKBFeedFilterViewChk" IsChecked="True" Checked="ZKBFeedFilterViewChk_Checked" Unchecked="ZKBFeedFilterViewChk_Checked" Margin="4"/>
-                                                <DataGrid x:Name="ZKBFeed" Grid.Row="1" AreRowDetailsFrozen="True" AutoGenerateColumns="False" CanUserAddRows="False" MouseDoubleClick="ZKBFeed_MouseDoubleClick_1" HeadersVisibility="Column" SelectionUnit="FullRow" GridLinesVisibility="None"  MinHeight="200">
-                                                    <DataGrid.Columns>
-                                                        <DataGridTextColumn Header="System" Binding="{Binding SystemName}" Width="30*" IsReadOnly="True" CanUserReorder="False" CanUserSort="False" />
-                                                        <DataGridTextColumn Header="Alliance" Binding="{Binding VictimAllianceName}" Width="40*" IsReadOnly="True" CanUserReorder="False" CanUserSort="False" />
-                                                        <DataGridTextColumn Header="Ship Type" Binding="{Binding ShipType}" Width="30*" IsReadOnly="True" CanUserReorder="False" CanUserSort="False" />
-                                                    </DataGrid.Columns>
-                                                    <DataGrid.RowStyle>
-                                                        <Style TargetType="DataGridRow">
-                                                            <Style.Setters>
-                                                                <Setter Property="Background">
-                                                                    <Setter.Value>
-                                                                        <Binding Converter="{StaticResource zkbBGConverter}" />
-                                                                    </Setter.Value>
-                                                                </Setter>
-                                                            </Style.Setters>
-                                                        </Style>
-                                                    </DataGrid.RowStyle>
-
-                                                    <DataGrid.ContextMenu>
-                                                        <ContextMenu>
-                                                            <MenuItem Header="Show System" Click="ZKBContexMenu_ShowSystem_Click" />
-                                                            <MenuItem Header="Open Kill on ZKB" Click="ZKBContexMenu_ShowZKB_Click" />
-                                                        </ContextMenu>
-                                                    </DataGrid.ContextMenu>
-                                                </DataGrid>
-                                            </StackPanel>
-                                        </ScrollViewer>
-                                    </Grid>
-                                </xcadl:LayoutAnchorable>
-                                <xcadl:LayoutAnchorable x:Name="IntelLayoutAnchorable"  Title="Intel" CanClose="False" CanAutoHide="True" CanHide="False" ContentId="IntelContentID" AutoHideMinHeight="200" AutoHideMinWidth="280">
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="*" />
-                                            <RowDefinition Height="25" />
-                                        </Grid.RowDefinitions>
-                                        <ListView x:Name="RawIntelBox" Margin="0,2" MouseDoubleClick="RawIntelBox_MouseDoubleClick" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Grid.Row="0" ItemTemplate="{StaticResource intelDataDataTemplate}" />
-                                        <Button Content="Clear Intel" Grid.Row="1" x:Name="ClearIntelBtn" Click="ClearIntelBtn_Click" />
-                                    </Grid>
-                                </xcadl:LayoutAnchorable>
-                            </xcadl:LayoutAnchorablePane>
-                        </xcadl:LayoutAnchorablePaneGroup>
-
-                        <xcadl:LayoutDocumentPane ShowHeader="True" AllowDuplicateContent="False">
-                            <xcadl:LayoutDocument CanClose="False" CanFloat="True" ContentId="UniverseContentID" Title="Regions">
-                                <Grid x:Name="MainUniverseGrid"  ClipToBounds="True" Grid.Row="1">
-                                    <Popup x:Name="RegionCharacterInfo" IsOpen="False" AllowsTransparency="True">
-                                        <StackPanel x:Name="RegionCharacterInfoSP" Background="#FF232223"/>
-                                    </Popup>
-                                    <Popup x:Name="RegionTheraInfo" IsOpen="False" AllowsTransparency="True">
-                                        <StackPanel x:Name="RegionTheraInfoSP" Background="#FF232223"/>
-                                    </Popup>
-
-                                    <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
-                                        <Canvas x:Name="MainUniverseCanvas"   Margin="5" Width="1050" Height="800" HorizontalAlignment="Stretch">
-                                        </Canvas>
-                                    </Viewbox>
-                                    <Border BorderThickness="2" BorderBrush="Black" Background="#FF232223" Width="135" Height="65" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,20,20" CornerRadius="4" Panel.ZIndex="111">
-                                        <Canvas x:Name="RegionsToolBoxCanvas">
-                                            <Grid Canvas.Left="0" Canvas.Top="2" >
-
-                                                <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,0,0,0" >
-
-                                                    <StackPanel Orientation="Horizontal" Margin="1,1" HorizontalAlignment="Center" VerticalAlignment="Center">
-
-                                                        <ToggleButton x:Name="ToggleStandingsBtn" Margin="1,0" Background="{x:Null}" BorderThickness="0" IsChecked="{Binding Path=MapConf.ShowRegionStandings}" ToolTip="Show Region Standings" Width="30" Height="30"  >
-                                                            <ToggleButton.Style>
-                                                                <Style TargetType="{x:Type ToggleButton}">
-                                                                    <Setter Property="Background">
-                                                                        <Setter.Value>
-                                                                            <SolidColorBrush Color="Transparent" >
-                                                                            </SolidColorBrush>
-                                                                        </Setter.Value>
-                                                                    </Setter>
-                                                                </Style>
-                                                            </ToggleButton.Style>
-                                                            <Image>
-                                                                <Image.Style>
-                                                                    <Style TargetType="Image">
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding ElementName=ToggleStandingsBtn,Path=IsChecked}" Value="True">
-                                                                                <Setter Property="Image.Source" Value="Images/Standings.png" />
-                                                                            </DataTrigger>
-
-                                                                            <DataTrigger Binding="{Binding ElementName=ToggleStandingsBtn,Path=IsChecked}" Value="false">
-                                                                                <Setter Property="Image.Source" Value="Images/Standings Inactive.png" />
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Image.Style>
-                                                            </Image>
-                                                        </ToggleButton>
-
-                                                        <ToggleButton x:Name="TogglePodKillsBtn" Margin="1,0" Background="{x:Null}" BorderThickness="0" IsChecked="{Binding Path=MapConf.ShowUniversePods}" ToolTip="Pod kills in the Last hour" Width="30" Height="30">
-                                                            <ToggleButton.Style>
-                                                                <Style TargetType="{x:Type ToggleButton}">
-                                                                    <Setter Property="Background">
-                                                                        <Setter.Value>
-                                                                            <SolidColorBrush Color="Transparent" >
-                                                                            </SolidColorBrush>
-                                                                        </Setter.Value>
-                                                                    </Setter>
-                                                                </Style>
-                                                            </ToggleButton.Style>
-                                                            <Image>
-                                                                <Image.Style>
-                                                                    <Style TargetType="Image">
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding ElementName=TogglePodKillsBtn,Path=IsChecked}" Value="True">
-                                                                                <Setter Property="Image.Source" Value="Images/Pod.png" />
-                                                                            </DataTrigger>
-
-                                                                            <DataTrigger Binding="{Binding ElementName=TogglePodKillsBtn,Path=IsChecked}" Value="false">
-                                                                                <Setter Property="Image.Source" Value="Images/Pod Inactive.png" />
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Image.Style>
-                                                            </Image>
-                                                        </ToggleButton>
-
-                                                        <ToggleButton x:Name="ToggleShipKillsBtn" Margin="1,0" Background="{x:Null}" BorderThickness="0" BorderBrush="Transparent" Foreground="Transparent" IsChecked="{Binding Path=MapConf.ShowUniverseKills}" ToolTip="Ship kill in the Last hour" Width="30" Height="30" >
-                                                            <ToggleButton.Style>
-                                                                <Style TargetType="{x:Type ToggleButton}">
-                                                                    <Setter Property="Background">
-                                                                        <Setter.Value>
-                                                                            <SolidColorBrush Color="Transparent" >
-                                                                            </SolidColorBrush>
-                                                                        </Setter.Value>
-                                                                    </Setter>
-                                                                </Style>
-                                                            </ToggleButton.Style>
-                                                            <Image>
-                                                                <Image.Style>
-                                                                    <Style TargetType="Image">
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding ElementName=ToggleShipKillsBtn,Path=IsChecked}" Value="True">
-                                                                                <Setter Property="Image.Source" Value="Images/Ship.png" />
-                                                                            </DataTrigger>
-
-                                                                            <DataTrigger Binding="{Binding ElementName=ToggleShipKillsBtn,Path=IsChecked}" Value="false">
-                                                                                <Setter Property="Image.Source" Value="Images/Ship Inactive.png" />
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Image.Style>
-                                                            </Image>
-                                                        </ToggleButton>
-
-                                                        <ToggleButton x:Name="ToggleRatKillsBtn" Margin="1,0" Background="{x:Null}" BorderThickness="0" IsChecked="{Binding Path=MapConf.ShowUniverseRats}" ToolTip="NPC Kills in the Last hour" Width="30" Height="30">
-                                                            <ToggleButton.Style>
-                                                                <Style TargetType="{x:Type ToggleButton}">
-                                                                    <Setter Property="Background">
-                                                                        <Setter.Value>
-                                                                            <SolidColorBrush Color="Transparent" >
-                                                                            </SolidColorBrush>
-                                                                        </Setter.Value>
-                                                                    </Setter>
-                                                                </Style>
-                                                            </ToggleButton.Style>
-                                                            <Image>
-                                                                <Image.Style>
-                                                                    <Style TargetType="Image">
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding ElementName=ToggleRatKillsBtn,Path=IsChecked}" Value="True">
-                                                                                <Setter Property="Image.Source" Value="Images/Rat.png" />
-                                                                            </DataTrigger>
-
-                                                                            <DataTrigger Binding="{Binding ElementName=ToggleRatKillsBtn,Path=IsChecked}" Value="false">
-                                                                                <Setter Property="Image.Source" Value="Images/Rat Inactive.png" />
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Image.Style>
-                                                            </Image>
-                                                        </ToggleButton>
-                                                    </StackPanel>
-
-                                                    <Slider  Width="130" Cursor="Arrow" Margin="0" Value="{Binding MapConf.UniverseDataScale}" Minimum="0.1" Maximum="5" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="1" Foreground="{x:Null}" BorderBrush="{x:Null}" Background="{x:Null}" Height="19" ToolTip="Overlay/Data Scale" SmallChange="0.2" IsSnapToTickEnabled="True" TickFrequency="0.2"/>
-                                                </StackPanel>
-                                            </Grid>
-                                        </Canvas>
-                                    </Border>
-
-                                </Grid>
-                            </xcadl:LayoutDocument>
-
-                            <xcadl:LayoutDocument CanClose="False" CanFloat="True" ContentId="MapRegionContentID" Title="Region">
-                                <local:RegionControl x:Name="RegionRC" />
-                            </xcadl:LayoutDocument>
-
-                            <xcadl:LayoutDocument CanClose="False" CanFloat="True" ContentId="FullUniverseViewID" Title="Universe">
-                                <local:UniverseControl x:Name="UniverseUC" />
-                            </xcadl:LayoutDocument>
-                        </xcadl:LayoutDocumentPane>
-                    </xcadl:LayoutPanel>
-                </xcadl:LayoutRoot.RootPanel>
 
                 <xcadl:LayoutRoot.RightSide>
                     <xcadl:LayoutAnchorSide>
@@ -311,20 +105,20 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
                                     </Grid.RowDefinitions>
                                     <StackPanel Grid.Row="0">
                                         <Button x:Name="btnClearAnomList" Content="Clear" Click="btnClearAnomList_Click" />
-                                        <Label Content="{Binding Path=ANOMManager.ActiveSystem.SystemName}" FontSize="18" FontWeight="Bold" />
+                                        <Label Content="{Binding ANOMManager.ActiveSystem.SystemName}" FontSize="18" FontWeight="Bold" />
                                     </StackPanel>
 
-                                    <DataGrid  x:Name="AnomSigList" Grid.Row="1" AreRowDetailsFrozen="True" AutoGenerateColumns="False" ItemsSource="{Binding Path=ANOMManager.ActiveSystem.Anoms.Values}" HeadersVisibility="Column" >
+                                    <DataGrid  x:Name="AnomSigList" Grid.Row="1" AreRowDetailsFrozen="True" AutoGenerateColumns="False" ItemsSource="{Binding ANOMManager.ActiveSystem.Anoms.Values}" HeadersVisibility="Column" >
 
                                         <DataGrid.CellStyle>
-                                            <Style TargetType="DataGridCell">
+                                            <Style TargetType="{x:Type DataGridCell}">
 
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding Type}" Value="Unknown">
-                                                        <Setter Property="Background" Value="Red"></Setter>
+                                                        <Setter Property="Background" Value="Red"/>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding State}" Value="State2">
-                                                        <Setter Property="Background" Value="Green"></Setter>
+                                                        <Setter Property="Background" Value="Green"/>
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
@@ -346,7 +140,13 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
                             <xcadl:LayoutAnchorable Title="Map Colours" CanClose="False" CanAutoHide="True" CanHide="False" ContentId="MapColoursContentID" AutoHideMinHeight="200" AutoHideMinWidth="280">
                                 <ScrollViewer Background="{DynamicResource ButtonBackground}">
                                     <StackPanel>
-                                        <xctk:PropertyGrid x:Name="ColoursPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False" ShowTitle="False" ShowSummary="False" />
+                                        <xctk:PropertyGrid x:Name="ColoursPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False" >
+                                            <xctk:PropertyGrid.CategoryGroupHeaderTemplate>
+                                                <DataTemplate>
+                                                    <TextBlock Text="{Binding}" Foreground="Black"/>
+                                                </DataTemplate>
+                                            </xctk:PropertyGrid.CategoryGroupHeaderTemplate>
+                                        </xctk:PropertyGrid>
                                         <Separator />
                                         <Button x:Name="ResetColourData" Click="ResetColourData_Click" Content="Reset Colours" Margin="0,2" />
                                     </StackPanel>
@@ -388,7 +188,42 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
                                     <Button x:Name="ImportPasteJumpGatesBtn" Content="Import from Clipboard" Click="ImportPasteJumpGatesBtn_Click" Margin="2" Grid.Row="3" />
 
                                     <Label Content="Ansiblex Gates" Margin="2" Grid.Row="4" />
-                                    <ListBox x:Name="JumpBridgeList" Margin="2" Grid.Row="5" />
+                                    <DataGrid x:Name="JumpBridgeList" Margin="2" Grid.Row="5" AutoGenerateColumns="False" AreRowDetailsFrozen="True" IsReadOnly="True" SelectionUnit="FullRow" SelectedItem="{Binding SelectedItemProperty, Mode=TwoWay}">
+
+                                        <DataGrid.CellStyle>
+                                            <Style TargetType="{x:Type DataGridCell}">
+
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding FromID}" Value="0">
+                                                        <Setter Property="Background" Value="#222"/>
+                                                    </DataTrigger>
+
+                                                    <DataTrigger Binding="{Binding ToID}" Value="0">
+                                                        <Setter Property="Background" Value="#222"/>
+                                                    </DataTrigger>
+
+                                                    <DataTrigger Binding="{Binding Disabled}" Value="True">
+                                                        <Setter Property="Background" Value="Red"/>
+                                                    </DataTrigger>
+
+                                                </Style.Triggers>
+                                            </Style>
+                                        </DataGrid.CellStyle>
+
+                                        <DataGrid.ContextMenu>
+                                            <ContextMenu>
+                                                <MenuItem Header="Delete" Click="DeleteJumpBridgeMenuItem_Click" />
+                                                <MenuItem Header="Enable/Disable" Click="EnableDisableJumpBridgeMenuItem_Click" />
+                                            </ContextMenu>
+                                        </DataGrid.ContextMenu>
+
+
+                                        <DataGrid.Columns>
+                                            <DataGridTextColumn Header="From" Binding="{Binding From}" Width="*" />
+                                            <DataGridTextColumn Header="To" Binding="{Binding To}" Width="*" />
+                                        </DataGrid.Columns>
+                                    </DataGrid>
+
                                 </Grid>
                             </xcadl:LayoutAnchorable>
 
@@ -401,21 +236,22 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
                                                 <StackPanel Margin="4">
                                                     <StackPanel Orientation="Horizontal">
                                                         <Label Content="Mode"/>
-                                                        <ComboBox ItemsSource="{Binding Source={StaticResource navigationEnumData}}" SelectedItem="{Binding ElementName=RegionRC, Path=ActiveCharacter.NavigationMode}" Margin="2" Width="150"/>
+                                                        <ComboBox ItemsSource="{Binding Source={StaticResource navigationEnumData}}" SelectedItem="{Binding ActiveCharacter.NavigationMode, ElementName=RegionRC}" Margin="2" Width="150"/>
                                                     </StackPanel>
 
-                                                    <CheckBox Content="Use Ansiblex Gates" IsChecked="{Binding ElementName=RegionRC, Path=ActiveCharacter.UseAnsiblexGates}" Margin="2"/>
+                                                    <CheckBox Content="Use Ansiblex Gates" IsChecked="{Binding ActiveCharacter.UseAnsiblexGates, ElementName=RegionRC}" Margin="2"/>
 
                                                 </StackPanel>
                                             </GroupBox>
                                             <GroupBox Header="WayPoints" >
                                                 <StackPanel Margin="4">
-                                                    <ListBox ItemsSource="{Binding ElementName=RegionRC, Path=ActiveCharacter.Waypoints}" MinHeight="50" Margin="2"/>
+                                                    <ListBox ItemsSource="{Binding ActiveCharacter.Waypoints, ElementName=RegionRC}" MinHeight="50" Margin="2"/>
                                                     <StackPanel Orientation="Horizontal" Margin="2">
                                                         <dotNetKitControls:AutoCompleteComboBox x:Name="RouteSystemDropDownAC" FontSize="12" Width="156" SelectionChanged="RouteSystemDropDownAC_SelectionChanged"/>
                                                         <Button x:Name="AddWaypointsBtn" Click="AddWaypointsBtn_Click"  Content="Add WayPoint" Margin="2" />
                                                     </StackPanel>
 
+                                                    <Button x:Name="ReCalculateRouteBtn" Click="ReCalculateRouteBtn_Click"  Content="Recalculate" Margin="2"/>
                                                     <Button x:Name="ClearWaypointsBtn" Click="ClearWaypointsBtn_Click" Content="Clear All" Margin="2"/>
 
                                                 </StackPanel>
@@ -423,11 +259,11 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
 
                                             <GroupBox Header="Route">
                                                 <StackPanel Margin="4">
-                                                    <ListBox ItemsSource="{Binding ElementName=RegionRC, Path=ActiveCharacter.ActiveRoute}" MinHeight="50"/>
+                                                    <ListBox ItemsSource="{Binding ActiveCharacter.ActiveRoute, ElementName=RegionRC}" MinHeight="50"/>
 
                                                     <StackPanel Orientation="Horizontal" Margin="2">
                                                         <Label Content="Total number of jumps : "/>
-                                                        <Label Content="{Binding ElementName=RegionRC, Path=ActiveCharacter.ActiveRoute.Count}"/>
+                                                        <Label Content="{Binding ActiveCharacter.ActiveRoute.Count, ElementName=RegionRC}"/>
                                                     </StackPanel>
                                                     <Button x:Name="CopyRouteBtn" Click="CopyRouteBtn_Click" Content="Copy Route" Margin="2" />
                                                 </StackPanel>
@@ -459,7 +295,7 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
 
                                         <DataGrid  x:Name="TheraConnectionsList" Grid.Row="1" AreRowDetailsFrozen="True" AutoGenerateColumns="False" IsReadOnly="True" MouseDoubleClick="TheraConnectionsList_MouseDoubleClick" HeadersVisibility="Column" Background="AliceBlue" >
                                             <DataGrid.CellStyle>
-                                                <Style TargetType="DataGridCell">
+                                                <Style TargetType="{x:Type DataGridCell}">
 
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding EstimatedEOL}" Value="critical">
@@ -485,6 +321,182 @@ AncestorType={x:Type Window}}, Path=MapConf.IntelTextSize}"/>
                         </xcadl:LayoutAnchorGroup>
                     </xcadl:LayoutAnchorSide>
                 </xcadl:LayoutRoot.RightSide>
+                <xcadl:LayoutPanel>
+                    <xcadl:LayoutAnchorablePaneGroup DockWidth="250" DockMinWidth="250" Orientation="Vertical">
+                        <xcadl:LayoutAnchorablePane>
+                            <xcadl:LayoutAnchorable x:Name="ZKBLayoutAnchorable"  Title="ZKB Feed" CanClose="False" CanAutoHide="True" CanHide="False" ContentId="ZKBContentID" AutoHideMinHeight="200" AutoHideMinWidth="280">
+                                <Grid>
+                                    <ScrollViewer Background="{DynamicResource ButtonBackground}">
+                                        <StackPanel CanVerticallyScroll="True" ScrollViewer.CanContentScroll="True">
+                                            <CheckBox Content="Selected Region Only" x:Name="ZKBFeedFilterViewChk" IsChecked="True" Checked="ZKBFeedFilterViewChk_Checked" Unchecked="ZKBFeedFilterViewChk_Checked" Margin="4"/>
+                                            <DataGrid x:Name="ZKBFeed" Grid.Row="1" AreRowDetailsFrozen="True" AutoGenerateColumns="False" CanUserAddRows="False" MouseDoubleClick="ZKBFeed_MouseDoubleClick_1" HeadersVisibility="Column" SelectionUnit="FullRow" GridLinesVisibility="None"  MinHeight="200">
+                                                <DataGrid.Columns>
+                                                    <DataGridTextColumn Header="System" Binding="{Binding SystemName}" Width="30*" IsReadOnly="True" CanUserReorder="False" CanUserSort="False" />
+                                                    <DataGridTextColumn Header="Alliance" Binding="{Binding VictimAllianceName}" Width="40*" IsReadOnly="True" CanUserReorder="False" CanUserSort="False" />
+                                                    <DataGridTextColumn Header="Ship Type" Binding="{Binding ShipType}" Width="30*" IsReadOnly="True" CanUserReorder="False" CanUserSort="False" />
+                                                </DataGrid.Columns>
+                                                <DataGrid.RowStyle>
+                                                    <Style TargetType="{x:Type DataGridRow}">
+                                                        <Setter Property="Background" Value="{Binding Converter={StaticResource zkbBGConverter}}"/>
+                                                    </Style>
+                                                </DataGrid.RowStyle>
+
+                                                <DataGrid.ContextMenu>
+                                                    <ContextMenu>
+                                                        <MenuItem Header="Show System" Click="ZKBContexMenu_ShowSystem_Click" />
+                                                        <MenuItem Header="Open Kill on ZKB" Click="ZKBContexMenu_ShowZKB_Click" />
+                                                    </ContextMenu>
+                                                </DataGrid.ContextMenu>
+                                            </DataGrid>
+                                        </StackPanel>
+                                    </ScrollViewer>
+                                </Grid>
+                            </xcadl:LayoutAnchorable>
+                            <xcadl:LayoutAnchorable x:Name="IntelLayoutAnchorable"  Title="Intel" CanClose="False" CanAutoHide="True" CanHide="False" ContentId="IntelContentID" AutoHideMinHeight="200" AutoHideMinWidth="280">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="*" />
+                                        <RowDefinition Height="25" />
+                                    </Grid.RowDefinitions>
+                                    <ListView x:Name="RawIntelBox" Margin="0,2" MouseDoubleClick="RawIntelBox_MouseDoubleClick" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Grid.Row="0" ItemTemplate="{StaticResource intelDataDataTemplate}" />
+                                    <Button Content="Clear Intel" Grid.Row="1" x:Name="ClearIntelBtn" Click="ClearIntelBtn_Click" />
+                                </Grid>
+                            </xcadl:LayoutAnchorable>
+                        </xcadl:LayoutAnchorablePane>
+                    </xcadl:LayoutAnchorablePaneGroup>
+
+                    <xcadl:LayoutDocumentPane ShowHeader="True" AllowDuplicateContent="False">
+                        <xcadl:LayoutDocument CanClose="False" CanFloat="True" ContentId="UniverseContentID" Title="Regions">
+                            <Grid x:Name="MainUniverseGrid"  ClipToBounds="True" Grid.Row="1">
+                                <Popup x:Name="RegionCharacterInfo" IsOpen="False" AllowsTransparency="True">
+                                    <StackPanel x:Name="RegionCharacterInfoSP" Background="#FF232223"/>
+                                </Popup>
+                                <Popup x:Name="RegionTheraInfo" IsOpen="False" AllowsTransparency="True">
+                                    <StackPanel x:Name="RegionTheraInfoSP" Background="#FF232223"/>
+                                </Popup>
+
+                                <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
+                                    <Canvas x:Name="MainUniverseCanvas"   Margin="5" Width="1050" Height="800" HorizontalAlignment="Stretch"/>
+                                </Viewbox>
+                                <Border BorderThickness="2" BorderBrush="Black" Background="#FF232223" Width="135" Height="65" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,20,20" CornerRadius="4" Panel.ZIndex="111">
+                                    <Canvas x:Name="RegionsToolBoxCanvas">
+                                        <Grid Canvas.Left="0" Canvas.Top="2" >
+
+                                            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,0,0,0" >
+
+                                                <StackPanel Orientation="Horizontal" Margin="1,1" HorizontalAlignment="Center" VerticalAlignment="Center">
+
+                                                    <ToggleButton x:Name="ToggleStandingsBtn" Margin="1,0" Background="{x:Null}" BorderThickness="0" IsChecked="{Binding MapConf.ShowRegionStandings}" ToolTip="Show Region Standings" Width="30" Height="30"  >
+                                                        <ToggleButton.Style>
+                                                            <Style TargetType="{x:Type ToggleButton}">
+                                                                <Setter Property="Background" Value="Transparent"/>
+                                                            </Style>
+                                                        </ToggleButton.Style>
+                                                        <Image>
+                                                            <Image.Style>
+                                                                <Style TargetType="{x:Type Image}">
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding IsChecked, ElementName=ToggleStandingsBtn}" Value="True">
+                                                                            <Setter Property="Source" Value="Images/Standings.png" />
+                                                                        </DataTrigger>
+
+                                                                        <DataTrigger Binding="{Binding IsChecked, ElementName=ToggleStandingsBtn}" Value="false">
+                                                                            <Setter Property="Source" Value="Images/Standings Inactive.png" />
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </Image.Style>
+                                                        </Image>
+                                                    </ToggleButton>
+
+                                                    <ToggleButton x:Name="TogglePodKillsBtn" Margin="1,0" Background="{x:Null}" BorderThickness="0" IsChecked="{Binding MapConf.ShowUniversePods}" ToolTip="Pod kills in the Last hour" Width="30" Height="30">
+                                                        <ToggleButton.Style>
+                                                            <Style TargetType="{x:Type ToggleButton}">
+                                                                <Setter Property="Background" Value="Transparent"/>
+                                                            </Style>
+                                                        </ToggleButton.Style>
+                                                        <Image>
+                                                            <Image.Style>
+                                                                <Style TargetType="{x:Type Image}">
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding IsChecked, ElementName=TogglePodKillsBtn}" Value="True">
+                                                                            <Setter Property="Source" Value="Images/Pod.png" />
+                                                                        </DataTrigger>
+
+                                                                        <DataTrigger Binding="{Binding IsChecked, ElementName=TogglePodKillsBtn}" Value="false">
+                                                                            <Setter Property="Source" Value="Images/Pod Inactive.png" />
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </Image.Style>
+                                                        </Image>
+                                                    </ToggleButton>
+
+                                                    <ToggleButton x:Name="ToggleShipKillsBtn" Margin="1,0" Background="{x:Null}" BorderThickness="0" BorderBrush="Transparent" Foreground="Transparent" IsChecked="{Binding MapConf.ShowUniverseKills}" ToolTip="Ship kill in the Last hour" Width="30" Height="30" >
+                                                        <ToggleButton.Style>
+                                                            <Style TargetType="{x:Type ToggleButton}">
+                                                                <Setter Property="Background" Value="Transparent"/>
+                                                            </Style>
+                                                        </ToggleButton.Style>
+                                                        <Image>
+                                                            <Image.Style>
+                                                                <Style TargetType="{x:Type Image}">
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding IsChecked, ElementName=ToggleShipKillsBtn}" Value="True">
+                                                                            <Setter Property="Source" Value="Images/Ship.png" />
+                                                                        </DataTrigger>
+
+                                                                        <DataTrigger Binding="{Binding IsChecked, ElementName=ToggleShipKillsBtn}" Value="false">
+                                                                            <Setter Property="Source" Value="Images/Ship Inactive.png" />
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </Image.Style>
+                                                        </Image>
+                                                    </ToggleButton>
+
+                                                    <ToggleButton x:Name="ToggleRatKillsBtn" Margin="1,0" Background="{x:Null}" BorderThickness="0" IsChecked="{Binding MapConf.ShowUniverseRats}" ToolTip="NPC Kills in the Last hour" Width="30" Height="30">
+                                                        <ToggleButton.Style>
+                                                            <Style TargetType="{x:Type ToggleButton}">
+                                                                <Setter Property="Background" Value="Transparent"/>
+                                                            </Style>
+                                                        </ToggleButton.Style>
+                                                        <Image>
+                                                            <Image.Style>
+                                                                <Style TargetType="{x:Type Image}">
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding IsChecked, ElementName=ToggleRatKillsBtn}" Value="True">
+                                                                            <Setter Property="Source" Value="Images/Rat.png" />
+                                                                        </DataTrigger>
+
+                                                                        <DataTrigger Binding="{Binding IsChecked, ElementName=ToggleRatKillsBtn}" Value="false">
+                                                                            <Setter Property="Source" Value="Images/Rat Inactive.png" />
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </Image.Style>
+                                                        </Image>
+                                                    </ToggleButton>
+                                                </StackPanel>
+
+                                                <Slider  Width="130" Cursor="Arrow" Margin="0" Value="{Binding MapConf.UniverseDataScale}" Minimum="0.1" Maximum="5" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="1" Foreground="{x:Null}" BorderBrush="{x:Null}" Background="{x:Null}" Height="19" ToolTip="Overlay/Data Scale" SmallChange="0.2" IsSnapToTickEnabled="True" TickFrequency="0.2"/>
+                                            </StackPanel>
+                                        </Grid>
+                                    </Canvas>
+                                </Border>
+
+                            </Grid>
+                        </xcadl:LayoutDocument>
+
+                        <xcadl:LayoutDocument CanClose="False" CanFloat="True" ContentId="MapRegionContentID" Title="Region">
+                            <local:RegionControl x:Name="RegionRC" />
+                        </xcadl:LayoutDocument>
+
+                        <xcadl:LayoutDocument CanClose="False" CanFloat="True" ContentId="FullUniverseViewID" Title="Universe">
+                            <local:UniverseControl x:Name="UniverseUC" />
+                        </xcadl:LayoutDocument>
+                    </xcadl:LayoutDocumentPane>
+                </xcadl:LayoutPanel>
             </xcadl:LayoutRoot>
         </xcad:DockingManager>
 
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 04101d3f..7a92f99a 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -682,7 +682,8 @@ private void CheckGitHubVersionCallback(IAsyncResult asyncResult)
                                     nw.CurrentVersion = SMTVersion;
                                     nw.NewVersion = releaseInfo.TagName;
                                     nw.ReleaseURL = releaseInfo.HtmlUrl.ToString();
-                                    nw.Show();
+                                    nw.Owner = this;
+                                    nw.ShowDialog();
                                 }), DispatcherPriority.ApplicationIdle);
                             }
                         }
@@ -715,12 +716,24 @@ private void ClearWaypointsBtn_Click(object sender, RoutedEventArgs e)
             {
                 lock (c.ActiveRouteLock)
                 {
+
                     c.ActiveRoute.Clear();
                     c.Waypoints.Clear();
                 }
             }
         }
 
+        private void ReCalculateRouteBtn_Click(object sender, RoutedEventArgs e)
+        {
+            EVEData.LocalCharacter c = RegionRC.ActiveCharacter as EVEData.LocalCharacter;
+            if (c != null && c.Waypoints.Count > 0)
+            {
+                c.RecalcRoute();
+            }
+        }
+
+
+
         private void ColoursPropertyGrid_PropertyValueChanged(object sender, Xceed.Wpf.Toolkit.PropertyGrid.PropertyValueChangedEventArgs e)
         {
             RegionRC.ReDrawMap(true);
@@ -804,7 +817,9 @@ private async void ImportJumpGatesBtn_Click(object sender, RoutedEventArgs e)
                 }
             }
 
+            EVEData.Navigation.ClearJumpBridges();
             EVEData.Navigation.UpdateJumpBridges(EVEManager.JumpBridges.ToList());
+            RegionRC.ReDrawMap(true);
 
             ImportJumpGatesBtn.IsEnabled = true;
             ClearJumpGatesBtn.IsEnabled = true;
@@ -846,6 +861,11 @@ private void ImportPasteJumpGatesBtn_Click(object sender, RoutedEventArgs e)
                     }
                 } while (line != null);
             }
+
+            EVEData.Navigation.ClearJumpBridges();
+            EVEData.Navigation.UpdateJumpBridges(EVEManager.JumpBridges.ToList());
+            RegionRC.ReDrawMap(true);
+
         }
 
         private void MainWindow_Closed(object sender, EventArgs e)
@@ -1423,6 +1443,51 @@ private void FullScreenToggle_MenuItem_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void DeleteJumpBridgeMenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (JumpBridgeList.SelectedIndex == -1)
+            {
+                return;
+            }
+
+            EVEData.JumpBridge jb = JumpBridgeList.SelectedItem as EVEData.JumpBridge;
+
+            EVEManager.JumpBridges.Remove(jb);
+
+            EVEData.Navigation.ClearJumpBridges();
+            EVEData.Navigation.UpdateJumpBridges(EVEManager.JumpBridges.ToList());
+            RegionRC.ReDrawMap(true);
+
+            EVEData.LocalCharacter c = RegionRC.ActiveCharacter as EVEData.LocalCharacter;
+            if (c != null && c.Waypoints.Count > 0)
+            {
+                c.RecalcRoute();
+            }
+        }
+
+        private void EnableDisableJumpBridgeMenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (JumpBridgeList.SelectedIndex == -1)
+            {
+                return;
+            }
+
+            EVEData.JumpBridge jb = JumpBridgeList.SelectedItem as EVEData.JumpBridge;
+
+            jb.Disabled = !jb.Disabled;
+
+            EVEData.Navigation.ClearJumpBridges();
+            EVEData.Navigation.UpdateJumpBridges(EVEManager.JumpBridges.ToList());
+            RegionRC.ReDrawMap(true);
+
+            EVEData.LocalCharacter c = RegionRC.ActiveCharacter as EVEData.LocalCharacter;
+            if (c != null && c.Waypoints.Count > 0)
+            {
+                c.RecalcRoute();
+            }
+        }
+
+
 
 
         /*
diff --git a/MapColours.cs b/MapColours.cs
index 5edb2d24..d859e381 100644
--- a/MapColours.cs
+++ b/MapColours.cs
@@ -37,6 +37,11 @@ public class MapColours
         [DisplayName("Friendly")]
         public Color FriendlyJumpBridgeColour { get; set; }
 
+        [Category("Jump Bridges")]
+        [DisplayName("Disabled")]
+        public Color DisabledJumpBridgeColour { get; set; }
+
+
         [Category("Systems")]
         [DisplayName("In Region")]
         public Color InRegionSystemColour { get; set; }
diff --git a/MapConfig.cs b/MapConfig.cs
index 4db24977..7d53a64a 100644
--- a/MapConfig.cs
+++ b/MapConfig.cs
@@ -665,6 +665,7 @@ public void SetDefaultColours()
                 Name = "Default",
                 UserEditable = false,
                 FriendlyJumpBridgeColour = Color.FromRgb(102, 205, 170),
+                DisabledJumpBridgeColour = Color.FromRgb(205, 55, 50),
                 SystemOutlineColour = Color.FromRgb(0, 0, 0),
                 InRegionSystemColour = Color.FromRgb(255, 239, 213),
                 InRegionSystemTextColour = Color.FromRgb(0, 0, 0),
diff --git a/RegionControl.xaml.cs b/RegionControl.xaml.cs
index 58a9b8b6..1c0160e4 100644
--- a/RegionControl.xaml.cs
+++ b/RegionControl.xaml.cs
@@ -1414,6 +1414,7 @@ private void AddSystemsToMap()
             Brush SysOutRegionTextBrush = new SolidColorBrush(MapConf.ActiveColourScheme.OutRegionSystemTextColour);
 
             Brush FriendlyJumpBridgeBrush = new SolidColorBrush(MapConf.ActiveColourScheme.FriendlyJumpBridgeColour);
+            Brush DisabledJumpBridgeBrush = new SolidColorBrush(MapConf.ActiveColourScheme.DisabledJumpBridgeColour);
 
             Brush JumpInRange = new SolidColorBrush(MapConf.ActiveColourScheme.JumpRangeInColour);
 
@@ -2153,7 +2154,14 @@ private void AddSystemsToMap()
 
                             MainCanvas.Children.Add(jbOutofSystemBlob);
 
-                            jbOutofSystemBlob.Stroke = new SolidColorBrush(MapConf.ActiveColourScheme.FriendlyJumpBridgeColour);
+                            if(jb.Disabled)
+                            {
+                                jbOutofSystemBlob.Stroke = DisabledJumpBridgeBrush;
+                            }
+                            else
+                            {
+                                jbOutofSystemBlob.Stroke = FriendlyJumpBridgeBrush;
+                            }
                             jbOutofSystemBlob.Fill = jbOutofSystemBlob.Stroke;
                         }
                         else
@@ -2186,13 +2194,25 @@ private void AddSystemsToMap()
                         System.Windows.Shapes.Path path = new System.Windows.Shapes.Path();
                         path.Data = pathGeometry;
 
-                        path.Stroke = new SolidColorBrush(MapConf.ActiveColourScheme.FriendlyJumpBridgeColour);
+                        
 
                         path.StrokeThickness = 2;
 
                         DoubleCollection dashes = new DoubleCollection();
-                        dashes.Add(1.0);
-                        dashes.Add(1.0);
+
+                        if(!jb.Disabled)
+                        {
+                            dashes.Add(1.0);
+                            dashes.Add(1.0);
+                            path.Stroke = FriendlyJumpBridgeBrush;
+
+                        }
+                        else
+                        {
+                            dashes.Add(1.0);
+                            dashes.Add(3.0);
+                            path.Stroke = DisabledJumpBridgeBrush;
+                        }
 
                         path.StrokeDashArray = dashes;