From fbc9e12b8da743469b478039586d6239f57f6e0a Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 17:52:20 -0400
Subject: [PATCH 01/12] Update more pages to use localization

---
 src/Core/Resources/Resources.resx             | 24 +++++++++++++++++++
 .../Views/Controls/FileTransferControl.xaml   | 11 +++++----
 .../Controls/SetCommunicationControl.xaml     |  5 ++--
 .../Views/Controls/SetReaderLedControl.xaml   |  3 ++-
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/Core/Resources/Resources.resx b/src/Core/Resources/Resources.resx
index 8a32b24..bd8b910 100644
--- a/src/Core/Resources/Resources.resx
+++ b/src/Core/Resources/Resources.resx
@@ -257,6 +257,30 @@
     <value>Device Action</value>
     <comment>Header for device action section</comment>
   </data>
+  <data name="Manage_LedColor" xml:space="preserve">
+    <value>LED Color</value>
+    <comment>Label for LED color selection</comment>
+  </data>
+  <data name="Manage_SelectedFile" xml:space="preserve">
+    <value>Selected File</value>
+    <comment>Label for file selection in file transfer</comment>
+  </data>
+  <data name="Manage_Browse" xml:space="preserve">
+    <value>Browse</value>
+    <comment>Button text for file browser</comment>
+  </data>
+  <data name="Manage_Progress" xml:space="preserve">
+    <value>Progress</value>
+    <comment>Label for file transfer progress</comment>
+  </data>
+  <data name="Manage_BytesOf" xml:space="preserve">
+    <value> Bytes/</value>
+    <comment>Text between transferred and total bytes</comment>
+  </data>
+  <data name="Manage_Bytes" xml:space="preserve">
+    <value> Bytes</value>
+    <comment>Text for bytes unit</comment>
+  </data>
   
   <!-- Monitor Page -->
   <data name="Monitor_DeviceNotConnected" xml:space="preserve">
diff --git a/src/UI/Windows/Views/Controls/FileTransferControl.xaml b/src/UI/Windows/Views/Controls/FileTransferControl.xaml
index 44a8ad0..0add7c5 100644
--- a/src/UI/Windows/Views/Controls/FileTransferControl.xaml
+++ b/src/UI/Windows/Views/Controls/FileTransferControl.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:models="clr-namespace:OSDPBench.Core.Models;assembly=OSDPBench.Core"
              xmlns:converters="clr-namespace:OSDPBench.Windows.Converters"
+             xmlns:markup="clr-namespace:OSDPBench.Windows.Markup"
              d:DataContext="{d:DesignInstance models:FileTransferParameters,
                                             IsDesignTimeCreatable=false}"
              mc:Ignorable="d"
@@ -29,10 +30,10 @@
         
         <StackPanel Grid.Row="0" 
                     Orientation="Vertical">
-            <Label Content="Selected File"
+            <Label Content="{markup:Localize Manage_SelectedFile}"
                    Target="{Binding ElementName=FilePathTextBox}"/>
             <DockPanel>
-                <Button Content="Browse"
+                <Button Content="{markup:Localize Manage_Browse}"
                         DockPanel.Dock="Right"
                         Margin="10,0,0,0"
                         Click="BrowseFileButton_OnClick"
@@ -44,7 +45,7 @@
         </StackPanel>
 
         <StackPanel Grid.Row="2">
-            <Label Content="Progress"/>
+            <Label Content="{markup:Localize Manage_Progress}"/>
             <ProgressBar Value="{Binding ProgressPercentage, Mode=OneWay}"
                                   Maximum="100"
                                   Height="20"
@@ -52,9 +53,9 @@
             <Grid>
                 <TextBlock HorizontalAlignment="Left">
                     <Run Text="{Binding TransferredBytes, StringFormat={}{0:N0}}"/>
-                    <Run Text=" Bytes/"/>
+                    <Run Text="{markup:Localize Manage_BytesOf}"/>
                     <Run Text="{Binding TotalBytes, StringFormat={}{0:N0}}"/>
-                    <Run Text=" Bytes"/>
+                    <Run Text="{markup:Localize Manage_Bytes}"/>
                 </TextBlock>
             </Grid>
         </StackPanel>
diff --git a/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml b/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml
index 65fa07c..aaf34cb 100644
--- a/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml
+++ b/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
              xmlns:controls="clr-namespace:OSDPBench.Windows.Views.Controls"
+             xmlns:markup="clr-namespace:OSDPBench.Windows.Markup"
              d:DataContext="{d:DesignInstance Type=controls:SetCommunicationControl}"
              mc:Ignorable="d"
              d:DesignHeight="300" d:DesignWidth="300">
@@ -15,7 +16,7 @@
             <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Column="0" Orientation="Vertical">
-            <Label Content="Baud Rate"
+            <Label Content="{markup:Localize Connect_BaudRate}"
                    Target="{Binding ElementName=BaudRateComboBox}" />
             <ComboBox Name="BaudRateComboBox"
                       Margin="0 0 20 0"
@@ -23,7 +24,7 @@
                       SelectedItem="{Binding SelectedBaudRate, Mode=TwoWay}"/>
         </StackPanel>
         <StackPanel Grid.Column="1" Orientation="Vertical">
-            <Label Content="Address"
+            <Label Content="{markup:Localize Connect_Address}"
                    Target="{Binding ElementName=BaudRateComboBox}" />
             <ui:NumberBox Name="AddressNumberBox"
                           TextChanged="AddressNumberBox_OnTextChanged"
diff --git a/src/UI/Windows/Views/Controls/SetReaderLedControl.xaml b/src/UI/Windows/Views/Controls/SetReaderLedControl.xaml
index 831f995..5215df5 100644
--- a/src/UI/Windows/Views/Controls/SetReaderLedControl.xaml
+++ b/src/UI/Windows/Views/Controls/SetReaderLedControl.xaml
@@ -4,12 +4,13 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:controls="clr-namespace:OSDPBench.Windows.Views.Controls"
+             xmlns:markup="clr-namespace:OSDPBench.Windows.Markup"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance controls:SetReaderLedControl}"
              d:DesignHeight="300" d:DesignWidth="300">
     <Grid>
         <StackPanel Orientation="Vertical">
-            <Label Content="LED Color"
+            <Label Content="{markup:Localize Manage_LedColor}"
                    Target="{Binding ElementName=ColorComboBox}" />
             <ComboBox Name="ColorComboBox"
                       Margin="0 0 20 0"

From 5264b42ee93f5e3a5f4eb824e478e4f9a945c69e Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 18:11:19 -0400
Subject: [PATCH 02/12] A plan for migrating to a uniformed styling

---
 src/UI/Windows/App.xaml                       |  26 ++-
 src/UI/Windows/Styles/ComponentStyles.xaml    | 153 +++++++++++++
 src/UI/Windows/Styles/DesignTokens.xaml       |  61 +++++
 .../Windows/Styles/ExampleImplementation.md   | 173 +++++++++++++++
 src/UI/Windows/Styles/LayoutTemplates.xaml    | 128 +++++++++++
 src/UI/Windows/Styles/StyleGuide.md           | 210 ++++++++++++++++++
 6 files changed, 740 insertions(+), 11 deletions(-)
 create mode 100644 src/UI/Windows/Styles/ComponentStyles.xaml
 create mode 100644 src/UI/Windows/Styles/DesignTokens.xaml
 create mode 100644 src/UI/Windows/Styles/ExampleImplementation.md
 create mode 100644 src/UI/Windows/Styles/LayoutTemplates.xaml
 create mode 100644 src/UI/Windows/Styles/StyleGuide.md

diff --git a/src/UI/Windows/App.xaml b/src/UI/Windows/App.xaml
index 398e842..68df2ac 100644
--- a/src/UI/Windows/App.xaml
+++ b/src/UI/Windows/App.xaml
@@ -11,20 +11,23 @@
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemesDictionary />
                 <ui:ControlsDictionary />
+                <!-- OSDP Bench Design System -->
+                <ResourceDictionary Source="Styles/DesignTokens.xaml"/>
+                <ResourceDictionary Source="Styles/ComponentStyles.xaml"/>
+                <ResourceDictionary Source="Styles/LayoutTemplates.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-            <Style x:Key="PageTitleStyle" TargetType="TextBlock">
-                <Setter Property="FontSize" Value="36"/>
-                <Setter Property="FontWeight" Value="Bold"/>
-                <Setter Property="HorizontalAlignment" Value="Left"/>
-                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
-                <Setter Property="Margin" Value="10 0 0 0"/>
-            </Style>
+            
+            <!-- Legacy styles - kept for backwards compatibility -->
+            <!-- Use Style="{StaticResource Page.Title}" for new implementations -->
+            <Style x:Key="PageTitleStyle" TargetType="TextBlock" BasedOn="{StaticResource Page.Title}"/>
+            
+            <!-- Enhanced DataGrid styles -->
             <Style TargetType="DataGridColumnHeader">
                 <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
                 <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
                 <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
                 <Setter Property="BorderThickness" Value="0,0,0,1"/>
-                <Setter Property="Padding" Value="8,4"/>
+                <Setter Property="Padding" Value="{StaticResource Padding.Control}"/>
                 <Setter Property="FontWeight" Value="Bold"/>
                 <Style.Triggers>
                     <Trigger Property="IsMouseOver" Value="True">
@@ -32,9 +35,10 @@
                     </Trigger>
                 </Style.Triggers>
             </Style>
-            <Style TargetType="TextBlock">
-                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
-            </Style>
+            
+            <!-- Global TextBlock style -->
+            <Style TargetType="TextBlock" BasedOn="{StaticResource Text.Body}"/>
+            
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/UI/Windows/Styles/ComponentStyles.xaml b/src/UI/Windows/Styles/ComponentStyles.xaml
new file mode 100644
index 0000000..ddd8b73
--- /dev/null
+++ b/src/UI/Windows/Styles/ComponentStyles.xaml
@@ -0,0 +1,153 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="DesignTokens.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- Typography Styles -->
+    <Style x:Key="Text.Display" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource FontSize.Display}"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    
+    <Style x:Key="Text.Headline" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource FontSize.Headline}"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    
+    <Style x:Key="Text.Title" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource FontSize.Title}"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    
+    <Style x:Key="Text.Subtitle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource FontSize.Subtitle}"/>
+        <Setter Property="FontWeight" Value="Medium"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    
+    <Style x:Key="Text.Body" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource FontSize.Body}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    
+    <Style x:Key="Text.BodyLarge" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource FontSize.BodyLarge}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    
+    <Style x:Key="Text.Caption" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource FontSize.Caption}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}"/>
+    </Style>
+    
+    <!-- Status Text Styles -->
+    <Style x:Key="Text.Success" TargetType="TextBlock" BasedOn="{StaticResource Text.Body}">
+        <Setter Property="Foreground" Value="{StaticResource Brush.Success}"/>
+    </Style>
+    
+    <Style x:Key="Text.Warning" TargetType="TextBlock" BasedOn="{StaticResource Text.Body}">
+        <Setter Property="Foreground" Value="{StaticResource Brush.Warning}"/>
+    </Style>
+    
+    <Style x:Key="Text.Error" TargetType="TextBlock" BasedOn="{StaticResource Text.Body}">
+        <Setter Property="Foreground" Value="{StaticResource Brush.Error}"/>
+    </Style>
+    
+    <!-- Page Layout Styles -->
+    <Style x:Key="Page.Title" TargetType="TextBlock" BasedOn="{StaticResource Text.Display}">
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="Margin" Value="16,0,0,0"/>
+    </Style>
+    
+    <Style x:Key="Page.Container" TargetType="StackPanel">
+        <Setter Property="Orientation" Value="Vertical"/>
+        <Setter Property="Margin" Value="0,8"/>
+    </Style>
+    
+    <Style x:Key="Page.Header" TargetType="Grid">
+        <Setter Property="Margin" Value="{StaticResource Margin.Card}"/>
+    </Style>
+    
+    <!-- Card Styles -->
+    <Style x:Key="Card.Standard" TargetType="ui:Card">
+        <Setter Property="Margin" Value="{StaticResource Margin.Card}"/>
+        <Setter Property="Padding" Value="{StaticResource Padding.Card}"/>
+    </Style>
+    
+    <Style x:Key="Card.Content" TargetType="StackPanel">
+        <Setter Property="Orientation" Value="Vertical"/>
+    </Style>
+    
+    <!-- Form Control Styles -->
+    <Style x:Key="Label.Standard" TargetType="Label">
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+        <Setter Property="FontWeight" Value="Medium"/>
+        <Setter Property="Margin" Value="0,0,0,4"/>
+    </Style>
+    
+    <Style x:Key="TextBox.Standard" TargetType="TextBox">
+        <Setter Property="MinHeight" Value="{StaticResource Control.Height.Medium}"/>
+        <Setter Property="Margin" Value="{StaticResource Margin.Control}"/>
+        <Setter Property="Padding" Value="{StaticResource Padding.Control}"/>
+    </Style>
+    
+    <Style x:Key="ComboBox.Standard" TargetType="ComboBox">
+        <Setter Property="MinHeight" Value="{StaticResource Control.Height.Medium}"/>
+        <Setter Property="Margin" Value="{StaticResource Margin.Control}"/>
+        <Setter Property="MinWidth" Value="{StaticResource Control.Width.Medium}"/>
+    </Style>
+    
+    <Style x:Key="NumberBox.Standard" TargetType="ui:NumberBox">
+        <Setter Property="MinHeight" Value="{StaticResource Control.Height.Medium}"/>
+        <Setter Property="Margin" Value="{StaticResource Margin.Control}"/>
+        <Setter Property="MinWidth" Value="{StaticResource Control.Width.Small}"/>
+        <Setter Property="ClearButtonEnabled" Value="False"/>
+        <Setter Property="MaxDecimalPlaces" Value="0"/>
+    </Style>
+    
+    <!-- Button Styles -->
+    <Style x:Key="Button.Primary" TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
+        <Setter Property="Margin" Value="{StaticResource Margin.Button}"/>
+        <Setter Property="Padding" Value="{StaticResource Padding.Button}"/>
+        <Setter Property="MinHeight" Value="{StaticResource Control.Height.Medium}"/>
+    </Style>
+    
+    <Style x:Key="Button.Secondary" TargetType="ui:Button" BasedOn="{StaticResource Button.Primary}">
+        <Setter Property="Appearance" Value="Secondary"/>
+    </Style>
+    
+    <Style x:Key="Button.Transparent" TargetType="ui:Button" BasedOn="{StaticResource Button.Primary}">
+        <Setter Property="Appearance" Value="Transparent"/>
+    </Style>
+    
+    <!-- Section Styles -->
+    <Style x:Key="Section.Container" TargetType="StackPanel">
+        <Setter Property="Orientation" Value="Vertical"/>
+        <Setter Property="Margin" Value="{StaticResource Margin.Section}"/>
+    </Style>
+    
+    <Style x:Key="Section.Header" TargetType="ui:TextBlock">
+        <Setter Property="FontTypography" Value="Subtitle"/>
+        <Setter Property="Margin" Value="0,0,0,16"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+    </Style>
+    
+    <!-- Activity Indicator Styles -->
+    <Style x:Key="Activity.Container" TargetType="StackPanel">
+        <Setter Property="Orientation" Value="Horizontal"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0,0,16,0"/>
+    </Style>
+    
+    <Style x:Key="Activity.Label" TargetType="TextBlock" BasedOn="{StaticResource Text.Caption}">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0,0,4,0"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/UI/Windows/Styles/DesignTokens.xaml b/src/UI/Windows/Styles/DesignTokens.xaml
new file mode 100644
index 0000000..9cf8fb9
--- /dev/null
+++ b/src/UI/Windows/Styles/DesignTokens.xaml
@@ -0,0 +1,61 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <!-- Design Tokens for OSDP Bench -->
+    
+    <!-- Spacing System (8px grid) -->
+    <system:Double x:Key="Spacing.XSmall">4</system:Double>
+    <system:Double x:Key="Spacing.Small">8</system:Double>
+    <system:Double x:Key="Spacing.Medium">16</system:Double>
+    <system:Double x:Key="Spacing.Large">24</system:Double>
+    <system:Double x:Key="Spacing.XLarge">32</system:Double>
+    <system:Double x:Key="Spacing.XXLarge">48</system:Double>
+    
+    <!-- Standard Margins -->
+    <Thickness x:Key="Margin.Card">10,5</Thickness>
+    <Thickness x:Key="Margin.Control">0,0,16,0</Thickness>
+    <Thickness x:Key="Margin.Button">8,4</Thickness>
+    <Thickness x:Key="Margin.Section">0,0,0,16</Thickness>
+    
+    <!-- Standard Padding -->
+    <Thickness x:Key="Padding.Card">16</Thickness>
+    <Thickness x:Key="Padding.Control">8,4</Thickness>
+    <Thickness x:Key="Padding.Button">16,8</Thickness>
+    
+    <!-- Corner Radius -->
+    <CornerRadius x:Key="CornerRadius.Small">4</CornerRadius>
+    <CornerRadius x:Key="CornerRadius.Medium">8</CornerRadius>
+    <CornerRadius x:Key="CornerRadius.Large">12</CornerRadius>
+    
+    <!-- Typography Scale -->
+    <system:Double x:Key="FontSize.Caption">12</system:Double>
+    <system:Double x:Key="FontSize.Body">14</system:Double>
+    <system:Double x:Key="FontSize.BodyLarge">16</system:Double>
+    <system:Double x:Key="FontSize.Subtitle">20</system:Double>
+    <system:Double x:Key="FontSize.Title">24</system:Double>
+    <system:Double x:Key="FontSize.Headline">32</system:Double>
+    <system:Double x:Key="FontSize.Display">36</system:Double>
+    
+    <!-- Semantic Colors (Theme-aware) -->
+    <SolidColorBrush x:Key="Brush.Success" Color="#107C10"/>
+    <SolidColorBrush x:Key="Brush.Warning" Color="#FF8C00"/>
+    <SolidColorBrush x:Key="Brush.Error" Color="#D13438"/>
+    <SolidColorBrush x:Key="Brush.Info" Color="#0078D4"/>
+    
+    <!-- Activity Colors -->
+    <SolidColorBrush x:Key="Brush.Activity.Tx" Color="#DC143C"/>
+    <SolidColorBrush x:Key="Brush.Activity.Rx" Color="#32CD32"/>
+    <SolidColorBrush x:Key="Brush.Activity.Inactive" Color="#808080"/>
+    
+    <!-- Control Sizing -->
+    <system:Double x:Key="Control.Height.Small">28</system:Double>
+    <system:Double x:Key="Control.Height.Medium">32</system:Double>
+    <system:Double x:Key="Control.Height.Large">40</system:Double>
+    
+    <system:Double x:Key="Control.Width.Small">120</system:Double>
+    <system:Double x:Key="Control.Width.Medium">200</system:Double>
+    <system:Double x:Key="Control.Width.Large">280</system:Double>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/UI/Windows/Styles/ExampleImplementation.md b/src/UI/Windows/Styles/ExampleImplementation.md
new file mode 100644
index 0000000..f0f3bd4
--- /dev/null
+++ b/src/UI/Windows/Styles/ExampleImplementation.md
@@ -0,0 +1,173 @@
+# Style System Implementation Example
+
+## Before & After: Connect Page Styling
+
+This example shows how to apply the new style system to improve consistency and maintainability.
+
+### BEFORE (Current Implementation)
+```xml
+<StackPanel Orientation="Vertical" Margin="0 5">
+    <Grid Margin="10 5">
+        <TextBlock 
+            Text="{Binding RelativeSource={RelativeSource AncestorType=Page}, Path=Title}"
+            Style="{StaticResource PageTitleStyle}"/>
+        
+        <StackPanel Orientation="Horizontal" 
+                    HorizontalAlignment="Right" 
+                    VerticalAlignment="Center">
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0 0 15 0">
+                <TextBlock Text="{markup:Localize Activity_Tx}" VerticalAlignment="Center" Margin="0 0 5 0"/>
+                <controls:LedControl LastActivityTime="{Binding Path=ViewModel.LastTxActiveTime}" 
+                                   LedColor="Red" VerticalAlignment="Center"/>
+            </StackPanel>
+            <!-- Similar structure for RX -->
+        </StackPanel>
+    </Grid>
+    
+    <ui:Card Margin="10 5" Padding="10">
+        <StackPanel Orientation="Vertical">
+            <ui:TextBlock VerticalAlignment="Center"
+                         FontTypography="Subtitle"
+                         Text="{markup:Localize Connect_SerialPortSelection}" 
+                         TextWrapping="Wrap"
+                         Margin="0,0,0,10"/>
+            <!-- Form content -->
+        </StackPanel>
+    </ui:Card>
+</StackPanel>
+```
+
+### AFTER (With New Style System)
+```xml
+<StackPanel Style="{StaticResource Page.Container}">
+    <!-- Simplified page header using template -->
+    <ContentControl Content="{Binding RelativeSource={RelativeSource AncestorType=Page}, Path=Title}"
+                    Template="{StaticResource Template.PageHeader}"/>
+    
+    <!-- Consistent card styling -->
+    <ui:Card Style="{StaticResource Card.Standard}">
+        <StackPanel Style="{StaticResource Card.Content}">
+            <ui:TextBlock Style="{StaticResource Section.Header}"
+                         Text="{markup:Localize Connect_SerialPortSelection}"/>
+            
+            <!-- Form content with consistent styling -->
+            <ContentControl Tag="{markup:Localize Connect_SerialPort}"
+                           Template="{StaticResource Template.FormField}">
+                <ComboBox Style="{StaticResource ComboBox.Standard}"
+                         ItemsSource="{Binding ViewModel.AvailableSerialPorts}"
+                         DisplayMemberPath="Name"
+                         SelectedItem="{Binding ViewModel.SelectedSerialPort}"/>
+            </ContentControl>
+        </StackPanel>
+    </ui:Card>
+</StackPanel>
+```
+
+## Key Improvements
+
+### 1. Reduced Markup Complexity
+- **Before**: 15+ lines for page header + activity indicators
+- **After**: 2 lines using `Template.PageHeader`
+
+### 2. Consistent Spacing
+- **Before**: Mixed values (`Margin="10 5"`, `Margin="0 0 15 0"`)
+- **After**: Standardized tokens (`Style="{StaticResource Page.Container}"`)
+
+### 3. Better Maintainability
+- **Before**: Repeated activity indicator structure on every page
+- **After**: Centralized template, single point of maintenance
+
+### 4. Improved Semantics
+- **Before**: Generic `ui:TextBlock` with inline properties
+- **After**: Semantic `Section.Header` style with clear intent
+
+## Migration Steps
+
+### Step 1: Update Page Structure
+```xml
+<!-- Replace this -->
+<StackPanel Orientation="Vertical" Margin="0 5">
+
+<!-- With this -->
+<StackPanel Style="{StaticResource Page.Container}">
+```
+
+### Step 2: Standardize Page Headers
+```xml
+<!-- Replace complex header structure -->
+<Grid Margin="10 5">
+    <TextBlock Style="{StaticResource PageTitleStyle}" Text="..."/>
+    <!-- Activity indicators -->
+</Grid>
+
+<!-- With template -->
+<ContentControl Content="Page Title" 
+                Template="{StaticResource Template.PageHeader}"/>
+```
+
+### Step 3: Enhance Card Content
+```xml
+<!-- Replace inline styling -->
+<ui:Card Margin="10 5" Padding="10">
+    <StackPanel Orientation="Vertical">
+
+<!-- With style references -->
+<ui:Card Style="{StaticResource Card.Standard}">
+    <StackPanel Style="{StaticResource Card.Content}">
+```
+
+### Step 4: Upgrade Form Controls
+```xml
+<!-- Replace mixed styling -->
+<Label Content="Field Name"/>
+<ComboBox Margin="0 0 20 0" MinWidth="200"/>
+
+<!-- With consistent styles -->
+<Label Style="{StaticResource Label.Standard}" Content="Field Name"/>
+<ComboBox Style="{StaticResource ComboBox.Standard}"/>
+```
+
+### Step 5: Apply Status Colors
+```xml
+<!-- Replace hardcoded colors -->
+<TextBlock Text="Error message" Foreground="Red"/>
+
+<!-- With semantic styles -->
+<TextBlock Style="{StaticResource Text.Error}" Text="Error message"/>
+```
+
+## Expected Results
+
+### Visual Improvements
+- **Consistent spacing** throughout the application
+- **Unified typography** hierarchy 
+- **Proper semantic colors** that respond to theme changes
+- **Professional appearance** with reduced visual noise
+
+### Code Benefits
+- **Reduced XAML** complexity (30-40% fewer lines in complex layouts)
+- **Centralized styling** - change once, update everywhere
+- **Easier maintenance** - clear style references vs. inline properties
+- **Better readability** - semantic names explain intent
+
+### Performance Benefits
+- **Reduced parsing time** - fewer inline property setters
+- **Better memory usage** - shared style instances
+- **Faster theme switching** - centralized color references
+
+## Gradual Adoption Strategy
+
+### Phase 1: New Development (Immediate)
+- All new UI components use the new style system
+- New pages implement standard templates
+
+### Phase 2: Incremental Updates (Ongoing)
+- Update existing components when making changes
+- Prioritize high-traffic pages (Connect, Monitor, Manage)
+
+### Phase 3: Complete Migration (Future)
+- Systematic review and update of all remaining components
+- Remove legacy style overrides
+- Optimize for maximum consistency
+
+This approach ensures immediate benefits for new development while providing a clear path to full adoption.
\ No newline at end of file
diff --git a/src/UI/Windows/Styles/LayoutTemplates.xaml b/src/UI/Windows/Styles/LayoutTemplates.xaml
new file mode 100644
index 0000000..9ee0ddc
--- /dev/null
+++ b/src/UI/Windows/Styles/LayoutTemplates.xaml
@@ -0,0 +1,128 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+                    xmlns:controls="clr-namespace:OSDPBench.Windows.Views.Controls"
+                    xmlns:markup="clr-namespace:OSDPBench.Windows.Markup">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="DesignTokens.xaml"/>
+        <ResourceDictionary Source="ComponentStyles.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- Page Header Template -->
+    <ControlTemplate x:Key="Template.PageHeader" TargetType="ContentControl">
+        <Grid Style="{StaticResource Page.Header}">
+            <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}"
+                       Style="{StaticResource Page.Title}"/>
+            
+            <StackPanel Orientation="Horizontal" 
+                        HorizontalAlignment="Right" 
+                        VerticalAlignment="Center">
+                <!-- TX Activity Indicator -->
+                <StackPanel Style="{StaticResource Activity.Container}">
+                    <TextBlock Text="{markup:Localize Activity_Tx}" 
+                               Style="{StaticResource Activity.Label}"/>
+                    <controls:LedControl LastActivityTime="{Binding Path=ViewModel.LastTxActiveTime}" 
+                                         LedColor="Red" 
+                                         VerticalAlignment="Center"/>
+                </StackPanel>
+                
+                <!-- RX Activity Indicator -->
+                <StackPanel Style="{StaticResource Activity.Container}">
+                    <TextBlock Text="{markup:Localize Activity_Rx}" 
+                               Style="{StaticResource Activity.Label}"/>
+                    <controls:LedControl LastActivityTime="{Binding Path=ViewModel.LastRxActiveTime}" 
+                                         LedColor="Red" 
+                                         VerticalAlignment="Center"/>
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+    </ControlTemplate>
+
+    <!-- Form Field Template -->
+    <ControlTemplate x:Key="Template.FormField" TargetType="ContentControl">
+        <StackPanel Orientation="Vertical" Margin="{StaticResource Margin.Section}">
+            <Label Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Tag}"
+                   Style="{StaticResource Label.Standard}"
+                   Target="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}"/>
+            <ContentPresenter/>
+        </StackPanel>
+    </ControlTemplate>
+
+    <!-- Status Message Template -->
+    <DataTemplate x:Key="Template.StatusMessage">
+        <TextBlock Text="{Binding StatusText}"
+                   TextAlignment="Center"
+                   TextWrapping="Wrap"
+                   HorizontalAlignment="Center"
+                   Margin="16,0">
+            <TextBlock.Style>
+                <Style TargetType="TextBlock" BasedOn="{StaticResource Text.Headline}">
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding StatusLevel}" Value="Connected">
+                            <Setter Property="Foreground" Value="{StaticResource Brush.Success}"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding StatusLevel}" Value="Error">
+                            <Setter Property="Foreground" Value="{StaticResource Brush.Error}"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding StatusLevel}" Value="Discovering">
+                            <Setter Property="Foreground" Value="{StaticResource Brush.Info}"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding StatusLevel}" Value="Disconnected">
+                            <Setter Property="Foreground" Value="{StaticResource Brush.Warning}"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </TextBlock.Style>
+        </TextBlock>
+    </DataTemplate>
+
+    <!-- Card Section Template -->
+    <Style x:Key="Style.CardSection" TargetType="ui:Card" BasedOn="{StaticResource Card.Standard}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ui:Card">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{StaticResource CornerRadius.Medium}"
+                            Padding="{TemplateBinding Padding}"
+                            Margin="{TemplateBinding Margin}">
+                        <ContentPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Data Grid Styles -->
+    <Style x:Key="DataGrid.Standard" TargetType="DataGrid">
+        <Setter Property="AutoGenerateColumns" Value="False"/>
+        <Setter Property="CanUserAddRows" Value="False"/>
+        <Setter Property="IsReadOnly" Value="True"/>
+        <Setter Property="Margin" Value="{StaticResource Margin.Card}"/>
+        <Setter Property="GridLinesVisibility" Value="Horizontal"/>
+        <Setter Property="HeadersVisibility" Value="Column"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+    </Style>
+
+    <Style x:Key="DataGrid.Monitor" TargetType="DataGrid" BasedOn="{StaticResource DataGrid.Standard}">
+        <Setter Property="RowDetailsVisibilityMode" Value="Collapsed"/>
+    </Style>
+
+    <!-- Progress Bar Template -->
+    <Style x:Key="ProgressBar.FileTransfer" TargetType="ProgressBar">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Maximum" Value="100"/>
+        <Setter Property="Margin" Value="0,0,0,4"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+    </Style>
+
+    <!-- Connection Type Section Template -->
+    <Style x:Key="Style.ConnectionSection" TargetType="Grid">
+        <Setter Property="Margin" Value="0,0,0,16"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/UI/Windows/Styles/StyleGuide.md b/src/UI/Windows/Styles/StyleGuide.md
new file mode 100644
index 0000000..ea4144c
--- /dev/null
+++ b/src/UI/Windows/Styles/StyleGuide.md
@@ -0,0 +1,210 @@
+# OSDP Bench UI Style Guide
+
+## Overview
+This style guide provides a comprehensive design system for OSDP Bench, ensuring visual consistency and maintainability across the application.
+
+## Design System Structure
+
+### 1. Design Tokens (`DesignTokens.xaml`)
+Foundation values for spacing, typography, colors, and sizing.
+
+#### Spacing System (8px grid)
+```xml
+{StaticResource Spacing.XSmall}    <!-- 4px -->
+{StaticResource Spacing.Small}     <!-- 8px -->
+{StaticResource Spacing.Medium}    <!-- 16px -->
+{StaticResource Spacing.Large}     <!-- 24px -->
+{StaticResource Spacing.XLarge}    <!-- 32px -->
+{StaticResource Spacing.XXLarge}   <!-- 48px -->
+```
+
+#### Standard Margins & Padding
+```xml
+{StaticResource Margin.Card}       <!-- 10,5 -->
+{StaticResource Margin.Control}    <!-- 0,0,16,0 -->
+{StaticResource Margin.Button}     <!-- 8,4 -->
+{StaticResource Padding.Card}      <!-- 16 -->
+{StaticResource Padding.Control}   <!-- 8,4 -->
+```
+
+#### Typography Scale
+```xml
+{StaticResource FontSize.Caption}  <!-- 12px -->
+{StaticResource FontSize.Body}     <!-- 14px -->
+{StaticResource FontSize.BodyLarge} <!-- 16px -->
+{StaticResource FontSize.Subtitle} <!-- 20px -->
+{StaticResource FontSize.Title}    <!-- 24px -->
+{StaticResource FontSize.Headline} <!-- 32px -->
+{StaticResource FontSize.Display}  <!-- 36px -->
+```
+
+### 2. Component Styles (`ComponentStyles.xaml`)
+Reusable styles for UI components.
+
+#### Typography Usage
+```xml
+<!-- Page titles -->
+<TextBlock Style="{StaticResource Page.Title}" Text="Page Name"/>
+
+<!-- Section headers -->
+<TextBlock Style="{StaticResource Text.Title}" Text="Section"/>
+
+<!-- Body text -->
+<TextBlock Style="{StaticResource Text.Body}" Text="Content"/>
+
+<!-- Status messages -->
+<TextBlock Style="{StaticResource Text.Error}" Text="Error message"/>
+<TextBlock Style="{StaticResource Text.Warning}" Text="Warning"/>
+<TextBlock Style="{StaticResource Text.Success}" Text="Success"/>
+```
+
+#### Form Controls
+```xml
+<!-- Labels -->
+<Label Style="{StaticResource Label.Standard}" Content="Field Name"/>
+
+<!-- Text boxes -->
+<TextBox Style="{StaticResource TextBox.Standard}"/>
+
+<!-- Combo boxes -->
+<ComboBox Style="{StaticResource ComboBox.Standard}"/>
+
+<!-- Number boxes -->
+<ui:NumberBox Style="{StaticResource NumberBox.Standard}"/>
+```
+
+#### Buttons
+```xml
+<!-- Primary actions -->
+<ui:Button Style="{StaticResource Button.Primary}" Content="Save"/>
+
+<!-- Secondary actions -->
+<ui:Button Style="{StaticResource Button.Secondary}" Content="Cancel"/>
+
+<!-- Transparent/subtle actions -->
+<ui:Button Style="{StaticResource Button.Transparent}" Content="Browse"/>
+```
+
+### 3. Layout Templates (`LayoutTemplates.xaml`)
+Templates for common layout patterns.
+
+#### Page Structure
+```xml
+<!-- Page container -->
+<StackPanel Style="{StaticResource Page.Container}">
+    <!-- Page header with activity indicators -->
+    <ContentControl Content="Page Title" 
+                    Template="{StaticResource Template.PageHeader}"/>
+    
+    <!-- Content cards -->
+    <ui:Card Style="{StaticResource Card.Standard}">
+        <StackPanel Style="{StaticResource Card.Content}">
+            <!-- Card content -->
+        </StackPanel>
+    </ui:Card>
+</StackPanel>
+```
+
+#### Data Grids
+```xml
+<!-- Standard data grid -->
+<DataGrid Style="{StaticResource DataGrid.Standard}">
+    <!-- Columns -->
+</DataGrid>
+
+<!-- Monitor page data grid -->
+<DataGrid Style="{StaticResource DataGrid.Monitor}">
+    <!-- Columns -->
+</DataGrid>
+```
+
+## Implementation Guidelines
+
+### 1. Migration Strategy
+1. **Immediate adoption**: Use new styles for all new components
+2. **Gradual migration**: Update existing components when making changes
+3. **Legacy support**: Existing `PageTitleStyle` remains functional
+
+### 2. Best Practices
+
+#### ✅ Do
+- Use design tokens for spacing: `Margin="{StaticResource Margin.Card}"`
+- Apply semantic color styles: `Style="{StaticResource Text.Error}"`
+- Follow typography hierarchy: Display → Headline → Title → Subtitle → Body
+- Use standard component styles for consistency
+- Leverage layout templates for common patterns
+
+#### ❌ Don't
+- Use hardcoded margins/padding values
+- Mix explicit FontSize with typography styles
+- Use hardcoded colors (Red, Orange, etc.)
+- Create one-off styles without considering reusability
+
+### 3. Common Patterns
+
+#### Form Layout
+```xml
+<StackPanel Style="{StaticResource Section.Container}">
+    <ui:TextBlock Style="{StaticResource Section.Header}" 
+                  Text="{markup:Localize Section_Title}"/>
+    
+    <!-- Form fields -->
+    <ContentControl Tag="{markup:Localize Field_Label}"
+                    Template="{StaticResource Template.FormField}">
+        <TextBox Style="{StaticResource TextBox.Standard}"/>
+    </ContentControl>
+</StackPanel>
+```
+
+#### Status Messages
+```xml
+<TextBlock Text="{Binding StatusMessage}">
+    <TextBlock.Style>
+        <Style TargetType="TextBlock" BasedOn="{StaticResource Text.Body}">
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding StatusLevel}" Value="Error">
+                    <Setter Property="Foreground" Value="{StaticResource Brush.Error}"/>
+                </DataTrigger>
+                <!-- Additional triggers -->
+            </Style.Triggers>
+        </Style>
+    </TextBlock.Style>
+</TextBlock>
+```
+
+### 4. Color System
+
+#### Semantic Colors
+- `{StaticResource Brush.Success}` - Green (#107C10)
+- `{StaticResource Brush.Warning}` - Orange (#FF8C00)  
+- `{StaticResource Brush.Error}` - Red (#D13438)
+- `{StaticResource Brush.Info}` - Blue (#0078D4)
+
+#### Activity Colors
+- `{StaticResource Brush.Activity.Tx}` - Transmit activity
+- `{StaticResource Brush.Activity.Rx}` - Receive activity
+- `{StaticResource Brush.Activity.Inactive}` - Inactive state
+
+#### Theme-Aware Colors (Recommended)
+- `{DynamicResource TextFillColorPrimaryBrush}` - Primary text
+- `{DynamicResource TextFillColorSecondaryBrush}` - Secondary text
+- `{DynamicResource ControlFillColorDefaultBrush}` - Control backgrounds
+
+## Future Enhancements
+
+### Planned Additions
+1. **Animation system** - Consistent transitions and micro-interactions
+2. **Responsive breakpoints** - Adaptive layouts for different window sizes
+3. **Dark mode optimizations** - Enhanced dark theme color palette
+4. **Accessibility styles** - High contrast and screen reader optimizations
+
+### Maintenance
+- Review and update design tokens quarterly
+- Add new component styles as needed
+- Maintain backwards compatibility for existing styles
+- Document any breaking changes in component updates
+
+## Resources
+- [WPF UI Documentation](https://wpfui.lepo.co/)
+- [Microsoft Fluent Design](https://www.microsoft.com/design/fluent/)
+- [Material Design System](https://material.io/design/introduction)
\ No newline at end of file

From cb86181dc934ea850eac8a829c835d3818881e08 Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 20:58:17 -0400
Subject: [PATCH 03/12] Start moving to standard styling

---
 src/UI/Windows/Styles/ComponentStyles.xaml    |  14 +++
 .../Views/Controls/FileTransferControl.xaml   |  34 +++---
 .../Controls/SetCommunicationControl.xaml     |  15 ++-
 .../Views/Controls/SetReaderLedControl.xaml   |   6 +-
 src/UI/Windows/Views/Pages/ConnectPage.xaml   | 104 +++++++-----------
 src/UI/Windows/Views/Pages/MonitorPage.xaml   |  77 +++++++------
 6 files changed, 120 insertions(+), 130 deletions(-)

diff --git a/src/UI/Windows/Styles/ComponentStyles.xaml b/src/UI/Windows/Styles/ComponentStyles.xaml
index ddd8b73..8b37e39 100644
--- a/src/UI/Windows/Styles/ComponentStyles.xaml
+++ b/src/UI/Windows/Styles/ComponentStyles.xaml
@@ -78,6 +78,20 @@
     <Style x:Key="Card.Standard" TargetType="ui:Card">
         <Setter Property="Margin" Value="{StaticResource Margin.Card}"/>
         <Setter Property="Padding" Value="{StaticResource Padding.Card}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    
+    <!-- Border Card Alternative -->
+    <Style x:Key="Card.Bordered" TargetType="Border">
+        <Setter Property="Margin" Value="{StaticResource Margin.Card}"/>
+        <Setter Property="Padding" Value="{StaticResource Padding.Card}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}"/>
+        <Setter Property="CornerRadius" Value="{StaticResource CornerRadius.Medium}"/>
     </Style>
     
     <Style x:Key="Card.Content" TargetType="StackPanel">
diff --git a/src/UI/Windows/Views/Controls/FileTransferControl.xaml b/src/UI/Windows/Views/Controls/FileTransferControl.xaml
index 0add7c5..01aa87a 100644
--- a/src/UI/Windows/Views/Controls/FileTransferControl.xaml
+++ b/src/UI/Windows/Views/Controls/FileTransferControl.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
              xmlns:models="clr-namespace:OSDPBench.Core.Models;assembly=OSDPBench.Core"
              xmlns:converters="clr-namespace:OSDPBench.Windows.Converters"
              xmlns:markup="clr-namespace:OSDPBench.Windows.Markup"
@@ -12,12 +13,6 @@
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
         <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
-        
-        <Style TargetType="ProgressBar">
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="BorderBrush" Value="#E6E6E6"/>
-            <Setter Property="BorderThickness" Value="1"/>
-        </Style>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -29,29 +24,31 @@
         </Grid.RowDefinitions>
         
         <StackPanel Grid.Row="0" 
-                    Orientation="Vertical">
+                    Style="{StaticResource Section.Container}">
             <Label Content="{markup:Localize Manage_SelectedFile}"
+                   Style="{StaticResource Label.Standard}"
                    Target="{Binding ElementName=FilePathTextBox}"/>
             <DockPanel>
-                <Button Content="{markup:Localize Manage_Browse}"
-                        DockPanel.Dock="Right"
-                        Margin="10,0,0,0"
-                        Click="BrowseFileButton_OnClick"
-                        IsEnabled="{Binding IsBusy, Converter={StaticResource InverseBoolConverter}}"/>
+                <ui:Button Content="{markup:Localize Manage_Browse}"
+                           Style="{StaticResource Button.Secondary}"
+                           DockPanel.Dock="Right"
+                           Click="BrowseFileButton_OnClick"
+                           IsEnabled="{Binding IsBusy, Converter={StaticResource InverseBoolConverter}}"/>
                 <TextBox Name="FilePathTextBox"
                          Text="{Binding FilePath}"
                          IsReadOnly="True"/>
             </DockPanel>
         </StackPanel>
 
-        <StackPanel Grid.Row="2">
-            <Label Content="{markup:Localize Manage_Progress}"/>
+        <StackPanel Grid.Row="2"
+                    Style="{StaticResource Section.Container}">
+            <Label Content="{markup:Localize Manage_Progress}"
+                   Style="{StaticResource Label.Standard}"/>
             <ProgressBar Value="{Binding ProgressPercentage, Mode=OneWay}"
-                                  Maximum="100"
-                                  Height="20"
-                                  Margin="0,0,0,5"/>
+                         Style="{StaticResource ProgressBar.FileTransfer}"/>
             <Grid>
-                <TextBlock HorizontalAlignment="Left">
+                <TextBlock Style="{StaticResource Text.Caption}"
+                           HorizontalAlignment="Left">
                     <Run Text="{Binding TransferredBytes, StringFormat={}{0:N0}}"/>
                     <Run Text="{markup:Localize Manage_BytesOf}"/>
                     <Run Text="{Binding TotalBytes, StringFormat={}{0:N0}}"/>
@@ -61,6 +58,7 @@
         </StackPanel>
 
         <TextBlock Grid.Row="4" 
+                   Style="{StaticResource Text.Body}"
                    Text="{Binding StatusMessage}"
                    TextWrapping="Wrap"/>
     </Grid>
diff --git a/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml b/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml
index aaf34cb..a854322 100644
--- a/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml
+++ b/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml
@@ -15,26 +15,29 @@
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
-        <StackPanel Grid.Column="0" Orientation="Vertical">
+        <StackPanel Grid.Column="0" 
+                    Style="{StaticResource Section.Container}">
             <Label Content="{markup:Localize Connect_BaudRate}"
+                   Style="{StaticResource Label.Standard}"
                    Target="{Binding ElementName=BaudRateComboBox}" />
             <ComboBox Name="BaudRateComboBox"
                       Margin="0 0 20 0"
                       ItemsSource="{Binding AvailableBaudRates}"
                       SelectedItem="{Binding SelectedBaudRate, Mode=TwoWay}"/>
         </StackPanel>
-        <StackPanel Grid.Column="1" Orientation="Vertical">
+        <StackPanel Grid.Column="1" 
+                    Style="{StaticResource Section.Container}">
             <Label Content="{markup:Localize Connect_Address}"
-                   Target="{Binding ElementName=BaudRateComboBox}" />
+                   Style="{StaticResource Label.Standard}"
+                   Target="{Binding ElementName=AddressNumberBox}" />
             <ui:NumberBox Name="AddressNumberBox"
                           TextChanged="AddressNumberBox_OnTextChanged"
                           ValueChanged="AddressNumberBox_OnValueChanged"
                           Value="{Binding SelectedAddress, Mode=TwoWay}"
-                          Margin="0 0 20 0"
                           Minimum="0"
                           Maximum="127"
-                          MaxDecimalPlaces="0"
-                          ClearButtonEnabled="False"/>
+                          ClearButtonEnabled="False"
+                          MaxDecimalPlaces="0"/>
         </StackPanel>
     </Grid>
 
diff --git a/src/UI/Windows/Views/Controls/SetReaderLedControl.xaml b/src/UI/Windows/Views/Controls/SetReaderLedControl.xaml
index 5215df5..9d78cda 100644
--- a/src/UI/Windows/Views/Controls/SetReaderLedControl.xaml
+++ b/src/UI/Windows/Views/Controls/SetReaderLedControl.xaml
@@ -3,20 +3,20 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
              xmlns:controls="clr-namespace:OSDPBench.Windows.Views.Controls"
              xmlns:markup="clr-namespace:OSDPBench.Windows.Markup"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance controls:SetReaderLedControl}"
              d:DesignHeight="300" d:DesignWidth="300">
     <Grid>
-        <StackPanel Orientation="Vertical">
+        <StackPanel Style="{StaticResource Section.Container}">
             <Label Content="{markup:Localize Manage_LedColor}"
+                   Style="{StaticResource Label.Standard}"
                    Target="{Binding ElementName=ColorComboBox}" />
             <ComboBox Name="ColorComboBox"
-                      Margin="0 0 20 0"
                       ItemsSource="{Binding AvailableColors}"
                       SelectedItem="{Binding SelectedColor}"
-                      Width="200"
                       HorizontalAlignment="Left" />
         </StackPanel>
     </Grid>
diff --git a/src/UI/Windows/Views/Pages/ConnectPage.xaml b/src/UI/Windows/Views/Pages/ConnectPage.xaml
index d6524a7..6dc0246 100644
--- a/src/UI/Windows/Views/Pages/ConnectPage.xaml
+++ b/src/UI/Windows/Views/Pages/ConnectPage.xaml
@@ -20,42 +20,16 @@
         <converters:IndexToVisibilityConverter x:Key="IndexToVisibilityConverter" />
     </Page.Resources>
 
-    <StackPanel 
-		Orientation="Vertical"
-		Margin="0 5">
-	    <Grid Margin="10 5">
-		    <TextBlock 
-			    Text="{Binding RelativeSource={RelativeSource AncestorType=Page}, Path=Title}"
-			    Style="{StaticResource PageTitleStyle}"/>
-            
-		    <StackPanel Orientation="Horizontal" 
-		                HorizontalAlignment="Right" 
-		                VerticalAlignment="Center">
-			    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0 0 15 0">
-				    <TextBlock Text="{markup:Localize Activity_Tx}" VerticalAlignment="Center" Margin="0 0 5 0"/>
-				    <controls:LedControl 
-					    LastActivityTime="{Binding Path=ViewModel.LastTxActiveTime}" 
-					    LedColor="Red" 
-					    VerticalAlignment="Center"/>
-			    </StackPanel>
-            
-			    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-				    <TextBlock Text="{markup:Localize Activity_Rx}" VerticalAlignment="Center" Margin="0 0 5 0"/>
-				    <controls:LedControl 
-					    LastActivityTime="{Binding Path=ViewModel.LastRxActiveTime}" 
-					    LedColor="Red" 
-					    VerticalAlignment="Center"/>
-			    </StackPanel>
-		    </StackPanel>
-	    </Grid>
-	    <ui:Card Margin="10 5" Padding="10">
-            <StackPanel Orientation="Vertical">
-                <ui:TextBlock
-					VerticalAlignment="Center"
-                    FontTypography="Subtitle"
-					Text="{markup:Localize Connect_SerialPortSelection}" 
-					TextWrapping="Wrap"
-                    Margin="0,0,0,10"/>
+    <StackPanel Style="{StaticResource Page.Container}">
+        <!-- Page Header with Activity Indicators -->
+        <ContentControl Content="{Binding RelativeSource={RelativeSource AncestorType=Page}, Path=Title}"
+                        Template="{StaticResource Template.PageHeader}"/>
+        <Border Style="{StaticResource Card.Bordered}">
+            <StackPanel Style="{StaticResource Card.Content}">
+                <ui:TextBlock FontTypography="Subtitle"
+                              Text="{markup:Localize Connect_SerialPortSelection}"
+                              TextWrapping="Wrap"
+                              Margin="0,0,0,10"/>
                 <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="200"/>
@@ -65,6 +39,7 @@
                 <!-- Serial Port Selection -->
                 <StackPanel Grid.Column="0" Orientation="Vertical">
                     <Label Content="{markup:Localize Connect_SerialPort}"
+                           Style="{StaticResource Label.Standard}"
                            Target="{Binding ElementName=SerialPortComboBox}" />
                     <ComboBox x:Name="SerialPortComboBox"
                               ItemsSource="{Binding ViewModel.AvailableSerialPorts }"
@@ -76,10 +51,9 @@
                 <TextBlock Grid.Column="1"
                            Text="{Binding ViewModel.UsbStatusText}"
                            VerticalAlignment="Center"
-                           Margin="10,0,0,0"
-                           Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}">
+                           Margin="10,0,0,0">
                     <TextBlock.Style>
-                        <Style TargetType="TextBlock">
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource Text.Caption}">
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Text, RelativeSource={RelativeSource Self}}" Value="">
                                     <Setter Property="Visibility" Value="Collapsed" />
@@ -90,10 +64,10 @@
                 </TextBlock>
             </Grid>
             </StackPanel>
-        </ui:Card>
-        <ui:Card Margin="10 5" Padding="10">
-            <StackPanel Orientation="Vertical">
-                <Grid Margin="0,0,0,10">
+        </Border>
+        <Border Style="{StaticResource Card.Bordered}">
+            <StackPanel Style="{StaticResource Card.Content}">
+                <Grid Style="{StaticResource Style.ConnectionSection}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -102,20 +76,17 @@
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" MinWidth="100" />
                     </Grid.ColumnDefinitions>
-                    <ui:TextBlock
-						Grid.Row="0"
-						Grid.Column="0"
-						VerticalAlignment="Center"
-                        FontTypography="Subtitle"
-						Text="{markup:Localize Connect_ConnectToPD}" 
-						TextWrapping="Wrap"/>
-                    <ui:TextBlock
-						Grid.Row="1"
-						Grid.Column="0"
-						Visibility="{Binding Path=ViewModel.StatusLevel, Converter={StaticResource StringToVisibilityConverter}, ConverterParameter=Connected, Mode=OneWay}"
-						FontSize="12"
-						Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-						TextWrapping="Wrap">
+                    <ui:TextBlock FontTypography="Subtitle"
+                                  Grid.Row="0"
+                                  Grid.Column="0"
+                                  Text="{markup:Localize Connect_ConnectToPD}"
+                                  TextWrapping="Wrap"
+                                  Margin="0,0,0,10"/>
+                    <ui:TextBlock Style="{StaticResource Text.Caption}"
+                                  Grid.Row="1"
+                                  Grid.Column="0"
+                                  Visibility="{Binding Path=ViewModel.StatusLevel, Converter={StaticResource StringToVisibilityConverter}, ConverterParameter=Connected, Mode=OneWay}"
+                                  TextWrapping="Wrap">
                         <ui:TextBlock.Text>
                             <MultiBinding StringFormat="{markup:Localize Connection_DeviceConnectedFormat}">
                                 <Binding Path="ViewModel.ConnectedAddress" />
@@ -136,11 +107,9 @@
                 <Grid 
 					Visibility="{Binding ElementName=ConnectionTypeComboBox, Path=SelectedIndex, Converter={StaticResource IndexToVisibilityConverter}, ConverterParameter=0, Mode=OneWay}">
                     <StackPanel Orientation="Vertical">
-                        <ui:TextBlock
+                        <ui:TextBlock Style="{StaticResource Text.Body}"
 							Margin="10 5"
 							HorizontalAlignment="Center"
-							FontSize="16"
-							FontTypography="Body"
 							Text="{markup:Localize Connect_DiscoveryWarning}" 
 							TextWrapping="Wrap"/>
                         <StackPanel Orientation="Horizontal"
@@ -209,6 +178,7 @@
                             </Grid.ColumnDefinitions>
                             <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Vertical">
                                 <Label Content="{markup:Localize Connect_BaudRate}"
+                                       Style="{StaticResource Label.Standard}"
 										   Target="{Binding ElementName=BaudRateComboBox}" />
                                 <ComboBox Name="BaudRateComboBox"
 										  Margin="0 0 20 0"
@@ -217,6 +187,7 @@
                             </StackPanel>
                             <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Vertical">
                                 <Label Content="{markup:Localize Connect_Address}"
+                                       Style="{StaticResource Label.Standard}"
 										   Target="{Binding ElementName=AddressNumberBox}" />
                                 <ui:NumberBox Name="AddressNumberBox"
 											  Value="{Binding Path=ViewModel.SelectedAddress, Mode=TwoWay}"
@@ -245,6 +216,7 @@
 	                           
 	                            <StackPanel Orientation="Vertical">
 		                            <Label Content="{markup:Localize Connect_SecurityKey}"
+		                                   Style="{StaticResource Label.Standard}"
 		                                   Target="{Binding ElementName=AddressNumberBox}" />
                                     <TextBox Text="{Binding Path=ViewModel.SecurityKey,  Mode=TwoWay}">
                                         <TextBox.Style>
@@ -303,7 +275,6 @@
                 </Grid>
 
                 <TextBlock 
-					FontSize="24"
 					Margin="10 5"
 					HorizontalAlignment="Center"
 					TextAlignment="Center"
@@ -311,7 +282,7 @@
 					Foreground="{Binding ViewModel.StatusLevel, Converter={StaticResource StatusLevelConverter}}"
 					Text="{Binding ViewModel.StatusText}">
                     <TextBlock.Style>
-                        <Style TargetType="TextBlock">
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource Text.Title}">
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Text, RelativeSource={RelativeSource Self}}" Value="">
                                     <Setter Property="Visibility" Value="Collapsed" />
@@ -321,16 +292,15 @@
                     </TextBlock.Style>
                 </TextBlock>
                 <TextBlock 
-					FontSize="24"
 					Margin="10 5"
 					HorizontalAlignment="Center"
 					TextAlignment="Center"
 					TextWrapping="Wrap"
-					FontWeight="Bold"
-					Foreground="Red"
 					Text="{Binding ViewModel.NakText}">
                     <TextBlock.Style>
-                        <Style TargetType="TextBlock">
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource Text.Error}">
+                            <Setter Property="FontSize" Value="{StaticResource FontSize.Title}"/>
+                            <Setter Property="FontWeight" Value="Bold"/>
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Text, RelativeSource={RelativeSource Self}}" Value="">
                                     <Setter Property="Visibility" Value="Collapsed" />
@@ -340,6 +310,6 @@
                     </TextBlock.Style>
                 </TextBlock>
             </StackPanel>
-        </ui:Card>
+        </Border>
     </StackPanel>
 </Page>
diff --git a/src/UI/Windows/Views/Pages/MonitorPage.xaml b/src/UI/Windows/Views/Pages/MonitorPage.xaml
index 5c9ecbb..10aaff7 100644
--- a/src/UI/Windows/Views/Pages/MonitorPage.xaml
+++ b/src/UI/Windows/Views/Pages/MonitorPage.xaml
@@ -49,28 +49,9 @@
 			</StackPanel>
 		</Grid>
 		
-		<StackPanel  Orientation="Vertical"
-		             Visibility="{Binding Path=ViewModel.StatusLevel, Converter={StaticResource StringToVisibilityConverter}, ConverterParameter=Disconnected, Mode=OneWay}">
-			<TextBlock
-				FontSize="32"
-				Margin="20 10 20 0"
-				HorizontalAlignment="Center"
-				TextAlignment="Center"
-				TextWrapping="Wrap"
-				Foreground="Orange"
-				Text="{markup:Localize Monitor_DeviceNotConnected}"/>
-			<TextBlock
-				FontSize="24"
-				Margin="20 10 20 0"
-				HorizontalAlignment="Center"
-				TextAlignment="Center"
-				TextWrapping="Wrap"
-				Text="{markup:Localize Monitor_ConnectionPageDetails}"/>
-		</StackPanel>
-		<StackPanel  Orientation="Vertical"
-		             Visibility="{Binding Path=ViewModel.StatusLevel, Converter={StaticResource StringToVisibilityConverter}, ConverterParameter=Connected, Mode=OneWay}">
-			<StackPanel  Orientation="Vertical"
-			             Visibility="{Binding Path=ViewModel.UsingSecureChannel, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}">
+		<Border Style="{StaticResource Card.Bordered}"
+		        Visibility="{Binding Path=ViewModel.StatusLevel, Converter={StaticResource StringToVisibilityConverter}, ConverterParameter=Disconnected, Mode=OneWay}">
+			<StackPanel Orientation="Vertical">
 				<TextBlock
 					FontSize="32"
 					Margin="20 10 20 0"
@@ -78,24 +59,47 @@
 					TextAlignment="Center"
 					TextWrapping="Wrap"
 					Foreground="Orange"
-					Text="{markup:Localize Monitor_MonitoringNotAvailable}"/>
+					Text="{markup:Localize Monitor_DeviceNotConnected}"/>
 				<TextBlock
 					FontSize="24"
 					Margin="20 10 20 0"
 					HorizontalAlignment="Center"
 					TextAlignment="Center"
 					TextWrapping="Wrap"
-					Text="{markup:Localize Monitor_SecureChannelUpdate}"/>
+					Text="{markup:Localize Monitor_ConnectionPageDetails}"/>
 			</StackPanel>
-			<StackPanel  Orientation="Vertical"
-			             Visibility="{Binding Path=ViewModel.UsingSecureChannel, Converter={StaticResource BooleanToVisibilityConverter}, ConverterParameter=Invert, Mode=OneWay}">
-
-				<DataGrid ItemsSource="{Binding ViewModel.TraceEntriesView}" 
-				          AutoGenerateColumns="False" 
-				          CanUserAddRows="False" 
-				          IsReadOnly="True" 
-				          Margin="10 5" 
-				          RowDetailsVisibilityMode="Collapsed">
+		</Border>
+		<StackPanel  Orientation="Vertical"
+		             Visibility="{Binding Path=ViewModel.StatusLevel, Converter={StaticResource StringToVisibilityConverter}, ConverterParameter=Connected, Mode=OneWay}">
+			<Border Style="{StaticResource Card.Bordered}"
+			        Visibility="{Binding Path=ViewModel.UsingSecureChannel, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}">
+				<StackPanel Orientation="Vertical">
+					<TextBlock
+						FontSize="32"
+						Margin="20 10 20 0"
+						HorizontalAlignment="Center"
+						TextAlignment="Center"
+						TextWrapping="Wrap"
+						Foreground="Orange"
+						Text="{markup:Localize Monitor_MonitoringNotAvailable}"/>
+					<TextBlock
+						FontSize="24"
+						Margin="20 10 20 0"
+						HorizontalAlignment="Center"
+						TextAlignment="Center"
+						TextWrapping="Wrap"
+						Text="{markup:Localize Monitor_SecureChannelUpdate}"/>
+				</StackPanel>
+			</Border>
+			<Border Style="{StaticResource Card.Bordered}"
+			        Visibility="{Binding Path=ViewModel.UsingSecureChannel, Converter={StaticResource BooleanToVisibilityConverter}, ConverterParameter=Invert, Mode=OneWay}">
+				<StackPanel Orientation="Vertical">
+					<DataGrid ItemsSource="{Binding ViewModel.TraceEntriesView}" 
+					          AutoGenerateColumns="False" 
+					          CanUserAddRows="False" 
+					          IsReadOnly="True" 
+					          Margin="10 5" 
+					          RowDetailsVisibilityMode="Collapsed">
 
 					<!-- DataGrid Columns -->
 					<DataGrid.Columns>
@@ -124,9 +128,10 @@
 							           FontFamily="Consolas"
 							           Margin="10" />
 						</DataTemplate>
-					</DataGrid.RowDetailsTemplate>
-				</DataGrid>
-			</StackPanel>
+						</DataGrid.RowDetailsTemplate>
+					</DataGrid>
+				</StackPanel>
+			</Border>
 		</StackPanel>
     </StackPanel>
 </Page>

From c7fcf9357898aefdb069611b34c86a7659ea3d23 Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 21:00:16 -0400
Subject: [PATCH 04/12] Fix styling for InfoPage

---
 src/UI/Windows/Views/Pages/InfoPage.xaml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/UI/Windows/Views/Pages/InfoPage.xaml b/src/UI/Windows/Views/Pages/InfoPage.xaml
index 5e7c2e7..b083612 100644
--- a/src/UI/Windows/Views/Pages/InfoPage.xaml
+++ b/src/UI/Windows/Views/Pages/InfoPage.xaml
@@ -24,16 +24,16 @@
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Column="0"
                     Grid.Row="0">
-            <TextBlock Text="{markup:Localize Info_ApplicationName}" FontWeight="Bold" />
-            <TextBlock Text="{Binding AppVersion}" FontWeight="Bold"  />
-            <TextBlock Text="{Binding CopyWriteNotice}" FontWeight="Bold"  />
+            <TextBlock Text="{markup:Localize Info_ApplicationName}" Style="{StaticResource Text.Title}" />
+            <TextBlock Text="{Binding AppVersion}" Style="{StaticResource Text.Subtitle}" />
+            <TextBlock Text="{Binding CopyWriteNotice}" Style="{StaticResource Text.Body}" />
             
             <!-- Language Selection -->
             <StackPanel Orientation="Horizontal" Margin="0,20,0,0">
                 <TextBlock Text="{markup:Localize Language_Selection}" 
+                           Style="{StaticResource Text.Subtitle}"
                            VerticalAlignment="Center" 
-                           Margin="0,0,10,0" 
-                           FontWeight="SemiBold"/>
+                           Margin="0,0,10,0"/>
                 <ComboBox x:Name="LanguageComboBox"
                           ItemsSource="{Binding ViewModel.LanguageViewModel.AvailableLanguages}"
                           SelectedItem="{Binding ViewModel.LanguageViewModel.SelectedLanguage, Mode=TwoWay}"
@@ -66,10 +66,9 @@
                     Grid.Row="2" 
                     Grid.ColumnSpan="2">
             <TextBlock Text="{markup:Localize Info_LicenseInfo}"
+                       Style="{StaticResource Text.Headline}"
                        HorizontalAlignment="Center"
-                       Margin="0, 30, 0,10"
-                       FontWeight="DemiBold"
-                       FontSize="32"/>
+                       Margin="0, 30, 0,10"/>
             <ui:CardExpander>
                 <ui:CardExpander.Header>
                     <ui:TextBlock

From b066734710d35c062c0d8b52a9e5e22be7153284 Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 21:15:49 -0400
Subject: [PATCH 05/12] Update the MonitorPage styling

---
 src/UI/Windows/Views/Pages/MonitorPage.xaml   | 44 ++++++++++++-------
 .../Windows/Views/Pages/MonitorPage.xaml.cs   |  4 +-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/UI/Windows/Views/Pages/MonitorPage.xaml b/src/UI/Windows/Views/Pages/MonitorPage.xaml
index 10aaff7..a3d65cf 100644
--- a/src/UI/Windows/Views/Pages/MonitorPage.xaml
+++ b/src/UI/Windows/Views/Pages/MonitorPage.xaml
@@ -32,7 +32,7 @@
 			            HorizontalAlignment="Right" 
 			            VerticalAlignment="Center">
 				<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0 0 15 0">
-					<TextBlock Text="{markup:Localize Activity_Tx}" VerticalAlignment="Center" Margin="0 0 5 0"/>
+					<TextBlock Text="{markup:Localize Activity_Tx}" Style="{StaticResource Activity.Label}"/>
 					<controls:LedControl 
 						LastActivityTime="{Binding Path=ViewModel.LastTxActiveTime}" 
 						LedColor="Red" 
@@ -40,7 +40,7 @@
 				</StackPanel>
             
 				<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-					<TextBlock Text="{markup:Localize Activity_Rx}" VerticalAlignment="Center" Margin="0 0 5 0"/>
+					<TextBlock Text="{markup:Localize Activity_Rx}" Style="{StaticResource Activity.Label}"/>
 					<controls:LedControl 
 						LastActivityTime="{Binding Path=ViewModel.LastRxActiveTime}" 
 						LedColor="Red" 
@@ -52,20 +52,19 @@
 		<Border Style="{StaticResource Card.Bordered}"
 		        Visibility="{Binding Path=ViewModel.StatusLevel, Converter={StaticResource StringToVisibilityConverter}, ConverterParameter=Disconnected, Mode=OneWay}">
 			<StackPanel Orientation="Vertical">
-				<TextBlock
-					FontSize="32"
+				<TextBlock Style="{StaticResource Text.Warning}"
 					Margin="20 10 20 0"
 					HorizontalAlignment="Center"
 					TextAlignment="Center"
 					TextWrapping="Wrap"
-					Foreground="Orange"
+					FontSize="{StaticResource FontSize.Headline}"
 					Text="{markup:Localize Monitor_DeviceNotConnected}"/>
-				<TextBlock
-					FontSize="24"
+				<TextBlock Style="{StaticResource Text.Body}"
 					Margin="20 10 20 0"
 					HorizontalAlignment="Center"
 					TextAlignment="Center"
 					TextWrapping="Wrap"
+					FontSize="{StaticResource FontSize.Title}"
 					Text="{markup:Localize Monitor_ConnectionPageDetails}"/>
 			</StackPanel>
 		</Border>
@@ -74,20 +73,19 @@
 			<Border Style="{StaticResource Card.Bordered}"
 			        Visibility="{Binding Path=ViewModel.UsingSecureChannel, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}">
 				<StackPanel Orientation="Vertical">
-					<TextBlock
-						FontSize="32"
+					<TextBlock Style="{StaticResource Text.Warning}"
 						Margin="20 10 20 0"
 						HorizontalAlignment="Center"
 						TextAlignment="Center"
 						TextWrapping="Wrap"
-						Foreground="Orange"
+						FontSize="{StaticResource FontSize.Headline}"
 						Text="{markup:Localize Monitor_MonitoringNotAvailable}"/>
-					<TextBlock
-						FontSize="24"
+					<TextBlock Style="{StaticResource Text.Body}"
 						Margin="20 10 20 0"
 						HorizontalAlignment="Center"
 						TextAlignment="Center"
 						TextWrapping="Wrap"
+						FontSize="{StaticResource FontSize.Title}"
 						Text="{markup:Localize Monitor_SecureChannelUpdate}"/>
 				</StackPanel>
 			</Border>
@@ -110,12 +108,25 @@
 						<DataGridTextColumn Header="{markup:Localize Monitor_Type}" Binding="{Binding Type}" />
 		        
 						<!-- Button Column -->
-						<DataGridTemplateColumn Header="{markup:Localize Monitor_Details}" Width="*">
+						<DataGridTemplateColumn Header="" Width="50">
 							<DataGridTemplateColumn.CellTemplate>
 								<DataTemplate>
-									<ui:Button Content="{markup:Localize Monitor_Expand}" DataContext="{Binding Details}"
-									           Margin="5"
-									        Click="ToggleRowDetails" />
+									<Grid HorizontalAlignment="Right">
+										<ui:Button Appearance="Transparent"
+										           BorderThickness="0"
+										           Padding="0"
+										           ToolTip="{markup:Localize Monitor_Expand}"
+										           DataContext="{Binding Details}"
+										           Margin="0,0,5,0"
+										           Width="24"
+										           Height="24"
+										           Cursor="Hand"
+										           Click="ToggleRowDetails">
+											<ui:Button.Icon>
+												<ui:SymbolIcon Symbol="ChevronDown24"/>
+											</ui:Button.Icon>
+										</ui:Button>
+									</Grid>
 								</DataTemplate>
 							</DataGridTemplateColumn.CellTemplate>
 						</DataGridTemplateColumn>
@@ -125,6 +136,7 @@
 					<DataGrid.RowDetailsTemplate>
 						<DataTemplate DataType="{x:Type models:PacketTraceEntry}">
 							<TextBlock Text="{Binding Details}"
+							           Style="{StaticResource Text.Body}"
 							           FontFamily="Consolas"
 							           Margin="10" />
 						</DataTemplate>
diff --git a/src/UI/Windows/Views/Pages/MonitorPage.xaml.cs b/src/UI/Windows/Views/Pages/MonitorPage.xaml.cs
index 9db577d..8c00e35 100644
--- a/src/UI/Windows/Views/Pages/MonitorPage.xaml.cs
+++ b/src/UI/Windows/Views/Pages/MonitorPage.xaml.cs
@@ -5,6 +5,7 @@
 using Wpf.Ui.Abstractions.Controls;
 using Button = Wpf.Ui.Controls.Button;
 using OSDPBench.Core.Resources;
+using Wpf.Ui.Controls;
 
 namespace OSDPBench.Windows.Views.Pages;
 
@@ -34,7 +35,8 @@ private void ToggleRowDetails(object sender, RoutedEventArgs e)
                     ? Visibility.Collapsed
                     : Visibility.Visible;
                 
-                button.Content = row.DetailsVisibility == Visibility.Visible ? OSDPBench.Core.Resources.Resources.GetString("Monitor_Collapse") : OSDPBench.Core.Resources.Resources.GetString("Monitor_Expand");
+                button.Icon = new SymbolIcon { Symbol = row.DetailsVisibility == Visibility.Visible ? SymbolRegular.ChevronUp24 : SymbolRegular.ChevronDown24 };
+                button.ToolTip = row.DetailsVisibility == Visibility.Visible ? OSDPBench.Core.Resources.Resources.GetString("Monitor_Collapse") : OSDPBench.Core.Resources.Resources.GetString("Monitor_Expand");
             }
         }
     }

From 6f1c2fa4f6806e0035a3604c5a08897c35f43fc7 Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 21:19:03 -0400
Subject: [PATCH 06/12] Update the ManagePage styling

---
 src/UI/Windows/Views/Pages/ManagePage.xaml | 41 ++++++++--------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/UI/Windows/Views/Pages/ManagePage.xaml b/src/UI/Windows/Views/Pages/ManagePage.xaml
index 0ab12d7..da2dadd 100644
--- a/src/UI/Windows/Views/Pages/ManagePage.xaml
+++ b/src/UI/Windows/Views/Pages/ManagePage.xaml
@@ -30,7 +30,7 @@
                         HorizontalAlignment="Right" 
                         VerticalAlignment="Center">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0 0 15 0">
-                    <TextBlock Text="{markup:Localize Activity_Tx}" VerticalAlignment="Center" Margin="0 0 5 0"/>
+                    <TextBlock Text="{markup:Localize Activity_Tx}" Style="{StaticResource Activity.Label}"/>
                     <controls:LedControl 
                         LastActivityTime="{Binding Path=ViewModel.LastTxActiveTime}" 
                         LedColor="Red" 
@@ -38,7 +38,7 @@
                 </StackPanel>
             
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                    <TextBlock Text="{markup:Localize Activity_Rx}" VerticalAlignment="Center" Margin="0 0 5 0"/>
+                    <TextBlock Text="{markup:Localize Activity_Rx}" Style="{StaticResource Activity.Label}"/>
                     <controls:LedControl 
                         LastActivityTime="{Binding Path=ViewModel.LastRxActiveTime}" 
                         LedColor="Red" 
@@ -48,20 +48,19 @@
         </Grid>
         <StackPanel  Orientation="Vertical"
                      Visibility="{Binding Path=ViewModel.StatusLevel, Converter={StaticResource StringToVisibilityConverter}, ConverterParameter=Disconnected, Mode=OneWay}">
-            <TextBlock
-                FontSize="32"
+            <TextBlock Style="{StaticResource Text.Warning}"
                 Margin="20 10 20 0"
                 HorizontalAlignment="Center"
                 TextAlignment="Center"
                 TextWrapping="Wrap"
-                Foreground="Orange"
+                FontSize="{StaticResource FontSize.Headline}"
                 Text="{markup:Localize Manage_DeviceNotIdentified}"/>
-            <TextBlock
-                FontSize="24"
+            <TextBlock Style="{StaticResource Text.Body}"
                 Margin="20 10 20 0"
                 HorizontalAlignment="Center"
                 TextAlignment="Center"
                 TextWrapping="Wrap"
+                FontSize="{StaticResource FontSize.Title}"
                 Text="{markup:Localize Manage_ConnectionPageDetails}"/>
         </StackPanel>
         <StackPanel  Orientation="Vertical"
@@ -77,33 +76,28 @@
                     <StackPanel Orientation="Horizontal"
                                 Margin="10 0 10 0"
                                 HorizontalAlignment="Center">
-                        <TextBlock
-                            FontSize="24"
+                        <TextBlock Style="{StaticResource Text.Title}"
                             TextAlignment="Left"
                             TextWrapping="Wrap"
                             Text="{Binding Path=ViewModel.IdentityLookup.VendorName}"
                             d:Text="ABC Corporation"/>
-                        <TextBlock
-                            FontSize="24"
+                        <TextBlock Style="{StaticResource Text.Title}"
                             TextAlignment="Left"
                             TextWrapping="Wrap"
                             Text=" ("/>
-                        <TextBlock
-                            FontSize="24"
+                        <TextBlock Style="{StaticResource Text.Title}"
                             TextAlignment="Left"
                             TextWrapping="Wrap">
                             <Hyperlink Click="Hyperlink_OnClick">
                                 <Run Text="{Binding Path=ViewModel.IdentityLookup.VendorCode}"/>
                             </Hyperlink>
                         </TextBlock>
-                        <TextBlock
-                            FontSize="24"
+                        <TextBlock Style="{StaticResource Text.Title}"
                             TextAlignment="Left"
                             TextWrapping="Wrap"
                             Text=")"/>
                     </StackPanel>
-                    <TextBlock
-                        FontSize="20"
+                    <TextBlock Style="{StaticResource Text.Subtitle}"
                         Margin="10 0 10 0"
                         HorizontalAlignment="Center"
                         TextAlignment="Center"
@@ -114,21 +108,18 @@
                     <StackPanel Orientation="Horizontal"
                                 Margin="10 0 10 0"
                                 HorizontalAlignment="Center">
-                        <TextBlock
-                            FontSize="20"
+                        <TextBlock Style="{StaticResource Text.Subtitle}"
                             TextAlignment="Left"
                             TextWrapping="Wrap"
                             Text="{markup:Localize Device_SerialNumberPrefix}"/>
-                        <TextBlock
-                            FontSize="20"
+                        <TextBlock Style="{StaticResource Text.Subtitle}"
                             TextAlignment="Left"
                             TextWrapping="Wrap"
                             Text="{Binding ViewModel.IdentityLookup.SerialNumber}"
                             d:Text="0000"/> 
                     </StackPanel>
 
-                    <TextBlock
-                        FontSize="20"
+                    <TextBlock Style="{StaticResource Text.Subtitle}"
                         Margin="10 0 10 0"
                         HorizontalAlignment="Center"
                         TextAlignment="Center"
@@ -156,11 +147,9 @@
                             FontTypography="Subtitle"
                             Text="{markup:Localize Manage_DeviceAction}" 
                             TextWrapping="Wrap"/>
-                        <ui:TextBlock
+                        <ui:TextBlock Style="{StaticResource Text.Caption}"
                             Grid.Row="1"
                             Grid.Column="0"
-                            FontSize="12"
-                            Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
                             TextWrapping="Wrap">
                             <ui:TextBlock.Text>
                                 <MultiBinding StringFormat="{markup:Localize Connection_DeviceConnectedFormat}">

From 6eeae72e1a929ae862c9f97d4f8fdc8adb8bb59f Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 21:56:59 -0400
Subject: [PATCH 07/12] Update the FileTransferControl to use style

---
 src/UI/Windows/Helpers/CopyTextBoxHelper.cs   | 71 +++++++++++++++++++
 src/UI/Windows/Styles/ComponentStyles.xaml    | 52 +++++++++++++-
 .../Views/Controls/FileTransferControl.xaml   |  3 +-
 .../Controls/FileTransferControl.xaml.cs      |  2 +
 .../Controls/MonitorCardReadsControl.xaml     | 43 +++++++++--
 5 files changed, 161 insertions(+), 10 deletions(-)
 create mode 100644 src/UI/Windows/Helpers/CopyTextBoxHelper.cs

diff --git a/src/UI/Windows/Helpers/CopyTextBoxHelper.cs b/src/UI/Windows/Helpers/CopyTextBoxHelper.cs
new file mode 100644
index 0000000..79920ee
--- /dev/null
+++ b/src/UI/Windows/Helpers/CopyTextBoxHelper.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace OSDPBench.Windows.Helpers;
+
+public static class CopyTextBoxHelper
+{
+    public static readonly DependencyProperty CopyCommandProperty =
+        DependencyProperty.RegisterAttached(
+            "CopyCommand",
+            typeof(ICommand),
+            typeof(CopyTextBoxHelper),
+            new PropertyMetadata(null));
+
+    public static ICommand GetCopyCommand(DependencyObject obj)
+    {
+        return (ICommand)obj.GetValue(CopyCommandProperty);
+    }
+
+    public static void SetCopyCommand(DependencyObject obj, ICommand value)
+    {
+        obj.SetValue(CopyCommandProperty, value);
+    }
+
+    public static readonly ICommand DefaultCopyCommand = new RelayCommand(
+        parameter =>
+        {
+            if (parameter is TextBox textBox && !string.IsNullOrEmpty(textBox.Text))
+            {
+                try
+                {
+                    Clipboard.SetText(textBox.Text);
+                }
+                catch (System.Runtime.InteropServices.COMException)
+                {
+                    // Clipboard is locked by another application, ignore silently
+                    // This is a common Windows issue and shouldn't crash the app
+                }
+            }
+        });
+}
+
+public class RelayCommand : ICommand
+{
+    private readonly Action<object> _execute;
+    private readonly Func<object, bool> _canExecute;
+
+    public RelayCommand(Action<object> execute, Func<object, bool> canExecute = null)
+    {
+        _execute = execute ?? throw new ArgumentNullException(nameof(execute));
+        _canExecute = canExecute;
+    }
+
+    public event EventHandler CanExecuteChanged
+    {
+        add { CommandManager.RequerySuggested += value; }
+        remove { CommandManager.RequerySuggested -= value; }
+    }
+
+    public bool CanExecute(object parameter)
+    {
+        return _canExecute?.Invoke(parameter) ?? true;
+    }
+
+    public void Execute(object parameter)
+    {
+        _execute(parameter);
+    }
+}
\ No newline at end of file
diff --git a/src/UI/Windows/Styles/ComponentStyles.xaml b/src/UI/Windows/Styles/ComponentStyles.xaml
index 8b37e39..7095983 100644
--- a/src/UI/Windows/Styles/ComponentStyles.xaml
+++ b/src/UI/Windows/Styles/ComponentStyles.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
+                    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+                    xmlns:helpers="clr-namespace:OSDPBench.Windows.Helpers">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="DesignTokens.xaml"/>
@@ -105,10 +106,57 @@
         <Setter Property="Margin" Value="0,0,0,4"/>
     </Style>
     
-    <Style x:Key="TextBox.Standard" TargetType="TextBox">
+    <Style x:Key="TextBox.Standard" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
         <Setter Property="MinHeight" Value="{StaticResource Control.Height.Medium}"/>
         <Setter Property="Margin" Value="{StaticResource Margin.Control}"/>
         <Setter Property="Padding" Value="{StaticResource Padding.Control}"/>
+        <Style.Triggers>
+            <Trigger Property="IsReadOnly" Value="True">
+                <Setter Property="Background" Value="#F5F5F5"/>
+                <Setter Property="ContextMenu" Value="{x:Null}"/>
+                <Setter Property="helpers:CopyTextBoxHelper.CopyCommand" Value="{x:Static helpers:CopyTextBoxHelper.DefaultCopyCommand}"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="TextBox">
+                            <Grid>
+                                <Border Background="#F5F5F5"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="4"
+                                        Padding="{TemplateBinding Padding}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <ScrollViewer Grid.Column="0"
+                                                      x:Name="PART_ContentHost"
+                                                      Focusable="False"
+                                                      HorizontalScrollBarVisibility="Hidden"
+                                                      VerticalScrollBarVisibility="Hidden"
+                                                      Margin="0,0,4,0"/>
+                                        <ui:Button Grid.Column="1"
+                                                   Appearance="Transparent"
+                                                   BorderThickness="0"
+                                                   Padding="4"
+                                                   Width="24"
+                                                   Height="24"
+                                                   VerticalAlignment="Center"
+                                                   ToolTip="Copy"
+                                                   Command="{Binding RelativeSource={RelativeSource AncestorType=TextBox}, Path=(helpers:CopyTextBoxHelper.CopyCommand)}"
+                                                   CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=TextBox}}">
+                                            <ui:Button.Icon>
+                                                <ui:SymbolIcon Symbol="Copy24"/>
+                                            </ui:Button.Icon>
+                                        </ui:Button>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
     </Style>
     
     <Style x:Key="ComboBox.Standard" TargetType="ComboBox">
diff --git a/src/UI/Windows/Views/Controls/FileTransferControl.xaml b/src/UI/Windows/Views/Controls/FileTransferControl.xaml
index 01aa87a..7d5de7c 100644
--- a/src/UI/Windows/Views/Controls/FileTransferControl.xaml
+++ b/src/UI/Windows/Views/Controls/FileTransferControl.xaml
@@ -36,7 +36,8 @@
                            IsEnabled="{Binding IsBusy, Converter={StaticResource InverseBoolConverter}}"/>
                 <TextBox Name="FilePathTextBox"
                          Text="{Binding FilePath}"
-                         IsReadOnly="True"/>
+                         IsReadOnly="True"
+                         Style="{StaticResource TextBox.Standard}"/>
             </DockPanel>
         </StackPanel>
 
diff --git a/src/UI/Windows/Views/Controls/FileTransferControl.xaml.cs b/src/UI/Windows/Views/Controls/FileTransferControl.xaml.cs
index 856d94f..49324f4 100644
--- a/src/UI/Windows/Views/Controls/FileTransferControl.xaml.cs
+++ b/src/UI/Windows/Views/Controls/FileTransferControl.xaml.cs
@@ -1,4 +1,5 @@
 using System.Windows;
+using System.Windows.Controls;
 using Microsoft.Win32;
 using OSDPBench.Core.Models;
 
@@ -28,4 +29,5 @@ private void BrowseFileButton_OnClick(object sender, RoutedEventArgs e)
             fileTransferParameters.FilePath = openFileDialog.FileName;
         }
     }
+
 }
\ No newline at end of file
diff --git a/src/UI/Windows/Views/Controls/MonitorCardReadsControl.xaml b/src/UI/Windows/Views/Controls/MonitorCardReadsControl.xaml
index 99c5fb9..b54dba4 100644
--- a/src/UI/Windows/Views/Controls/MonitorCardReadsControl.xaml
+++ b/src/UI/Windows/Views/Controls/MonitorCardReadsControl.xaml
@@ -21,10 +21,13 @@
                     Orientation="Vertical" 
                     Margin="0,0,0,10">
             <Label Content="{markup:Localize Monitor_LastCardRead}"
+                   Style="{StaticResource Label.Standard}"
                    Target="{Binding ElementName=CardNumberTextBox}" />
             <TextBox Name="CardNumberTextBox"
                      IsReadOnly="True"
-                     Margin="0,0,20,0"/>
+                     Margin="0,0,20,0"
+                     FontFamily="Consolas"
+                     Style="{StaticResource TextBox.Standard}"/>
         </StackPanel>
 
         <Grid Grid.Row="1">
@@ -36,12 +39,14 @@
             <DockPanel Grid.Row="0" 
                        Margin="0,0,20,5">
                 <Label Content="{markup:Localize Monitor_ReadHistory}"
+                       Style="{StaticResource Label.Standard}"
                        VerticalAlignment="Bottom"
                        DockPanel.Dock="Left"/>
-                <Button Content="{markup:Localize Monitor_ClearHistory}"
-                        DockPanel.Dock="Right"
-                        HorizontalAlignment="Right"
-                        Click="ClearHistory_Click"/>
+                <ui:Button Content="{markup:Localize Monitor_ClearHistory}"
+                           Appearance="Secondary"
+                           DockPanel.Dock="Right"
+                           HorizontalAlignment="Right"
+                           Click="ClearHistory_Click"/>
             </DockPanel>
 
             <ui:DataGrid Grid.Row="1" 
@@ -53,7 +58,30 @@
                          BorderThickness="1"
                          HeadersVisibility="Column"
                          VerticalScrollBarVisibility="Auto"
-                         MaxHeight="300" d:DataContext="{d:DesignInstance models:CardReadEntry}">
+                         MaxHeight="300"
+                         CanUserSortColumns="False"
+                         d:DataContext="{d:DesignInstance models:CardReadEntry}">
+                <ui:DataGrid.RowStyle>
+                    <Style TargetType="DataGridRow">
+                        <Style.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="Transparent"/>
+                                <Setter Property="BorderBrush" Value="Transparent"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </ui:DataGrid.RowStyle>
+                <ui:DataGrid.CellStyle>
+                    <Style TargetType="DataGridCell">
+                        <Style.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="Transparent"/>
+                                <Setter Property="BorderBrush" Value="Transparent"/>
+                                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </ui:DataGrid.CellStyle>
                 <ui:DataGrid.Columns>
                     <DataGridTextColumn Header="{markup:Localize Monitor_ColumnDateTime}" 
                                            Binding="{Binding Timestamp, StringFormat='MM/dd/yyyy HH:mm:ss'}"
@@ -75,7 +103,8 @@
                                          VerticalAlignment="Center"
                                          VerticalContentAlignment="Center"
                                          Padding="5 0"
-                                         Background="Transparent"/>
+                                         FontFamily="Consolas"
+                                         Style="{StaticResource TextBox.Standard}"/>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>

From 31b67bcf8b36686204de08ec3babfa17c83d502b Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 22:12:23 -0400
Subject: [PATCH 08/12] More style updates for FileTransferControl.xaml

---
 src/UI/Windows/Styles/LayoutTemplates.xaml    |  2 +-
 .../Views/Controls/FileTransferControl.xaml   | 26 +++++++------------
 .../Controls/MonitorKeypadReadsControl.xaml   | 18 +++++++++----
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/UI/Windows/Styles/LayoutTemplates.xaml b/src/UI/Windows/Styles/LayoutTemplates.xaml
index 9ee0ddc..6593e8a 100644
--- a/src/UI/Windows/Styles/LayoutTemplates.xaml
+++ b/src/UI/Windows/Styles/LayoutTemplates.xaml
@@ -112,7 +112,7 @@
 
     <!-- Progress Bar Template -->
     <Style x:Key="ProgressBar.FileTransfer" TargetType="ProgressBar">
-        <Setter Property="Height" Value="20"/>
+        <Setter Property="Height" Value="{StaticResource Control.Height.Medium}"/>
         <Setter Property="Maximum" Value="100"/>
         <Setter Property="Margin" Value="0,0,0,4"/>
         <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
diff --git a/src/UI/Windows/Views/Controls/FileTransferControl.xaml b/src/UI/Windows/Views/Controls/FileTransferControl.xaml
index 7d5de7c..38d4d79 100644
--- a/src/UI/Windows/Views/Controls/FileTransferControl.xaml
+++ b/src/UI/Windows/Views/Controls/FileTransferControl.xaml
@@ -14,17 +14,10 @@
     <UserControl.Resources>
         <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
     </UserControl.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="10"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="10"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
+    <StackPanel Orientation="Vertical" 
+                Margin="{StaticResource Margin.Card}">
         
-        <StackPanel Grid.Row="0" 
-                    Style="{StaticResource Section.Container}">
+        <StackPanel Orientation="Vertical" >
             <Label Content="{markup:Localize Manage_SelectedFile}"
                    Style="{StaticResource Label.Standard}"
                    Target="{Binding ElementName=FilePathTextBox}"/>
@@ -37,12 +30,14 @@
                 <TextBox Name="FilePathTextBox"
                          Text="{Binding FilePath}"
                          IsReadOnly="True"
-                         Style="{StaticResource TextBox.Standard}"/>
+                         Style="{StaticResource TextBox.Standard}"
+                         MinHeight="0"
+                         Height="Auto"
+                         VerticalAlignment="Center"/>
             </DockPanel>
         </StackPanel>
 
-        <StackPanel Grid.Row="2"
-                    Style="{StaticResource Section.Container}">
+        <StackPanel Orientation="Vertical">
             <Label Content="{markup:Localize Manage_Progress}"
                    Style="{StaticResource Label.Standard}"/>
             <ProgressBar Value="{Binding ProgressPercentage, Mode=OneWay}"
@@ -58,9 +53,8 @@
             </Grid>
         </StackPanel>
 
-        <TextBlock Grid.Row="4" 
-                   Style="{StaticResource Text.Body}"
+        <TextBlock Style="{StaticResource Text.Body}"
                    Text="{Binding StatusMessage}"
                    TextWrapping="Wrap"/>
-    </Grid>
+    </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/UI/Windows/Views/Controls/MonitorKeypadReadsControl.xaml b/src/UI/Windows/Views/Controls/MonitorKeypadReadsControl.xaml
index ad0ff2d..8f4d896 100644
--- a/src/UI/Windows/Views/Controls/MonitorKeypadReadsControl.xaml
+++ b/src/UI/Windows/Views/Controls/MonitorKeypadReadsControl.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
              xmlns:markup="clr-namespace:OSDPBench.Windows.Markup"
              mc:Ignorable="d"
              d:DesignHeight="300" d:DesignWidth="300">
@@ -10,15 +11,22 @@
         <Grid>
             <StackPanel Orientation="Vertical">
                 <Label Content="{markup:Localize Monitor_KeypadEntries}"
+                       Style="{StaticResource Label.Standard}"
                        Target="{Binding ElementName=KeypadTextBox}" />
                 <StackPanel Orientation="Horizontal">
                     <TextBox Name="KeypadTextBox"
                              MinWidth="200"
-                                     IsReadOnly="True"
-                                     Margin="0 0 20 0"/>
-                    <Button Name="ClearButton"
-                            Content="{markup:Localize Monitor_Clear}"
-                            Click="ClearButton_OnClick"/>
+                             IsReadOnly="True"
+                             FontFamily="Consolas"
+                             Style="{StaticResource TextBox.Standard}"
+                             MinHeight="0"
+                             Height="Auto"
+                             VerticalAlignment="Center"
+                             Margin="0,0,20,0"/>
+                    <ui:Button Name="ClearButton"
+                               Content="{markup:Localize Monitor_Clear}"
+                               Style="{StaticResource Button.Secondary}"
+                               Click="ClearButton_OnClick"/>
                 </StackPanel>
             </StackPanel>
         </Grid>

From 2c7426e93e32408ca821e12fbdc5fdbff6b718a6 Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Fri, 27 Jun 2025 22:18:17 -0400
Subject: [PATCH 09/12] Update Style documentation

---
 README.md                           |  1 +
 docs/CLAUDE.md                      |  7 ++++--
 src/UI/Windows/Styles/StyleGuide.md | 37 +++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a4b920d..50852ee 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ Core functionality is under an open source license to help increase the adoption
 
 ### Project Documentation
 - **[Developer Guidelines](docs/CLAUDE.md)** - Development guidelines and build commands
+- **[UI Style Guide](src/UI/Windows/Styles/StyleGuide.md)** - Comprehensive design system and styling guidelines
 
 ### Architecture Plans
 - **[Connection Plugin Architecture](docs/CONNECTION_PLUGIN_ARCHITECTURE.md)** - Plan for implementing pluggable connection types (Serial, Bluetooth, Network)
diff --git a/docs/CLAUDE.md b/docs/CLAUDE.md
index 0621c51..0b0fad9 100644
--- a/docs/CLAUDE.md
+++ b/docs/CLAUDE.md
@@ -16,14 +16,17 @@
 
 ## Code Style Guidelines
 - Use C# 8.0+ features with async/await patterns for asynchronous operations
-- Follow MVVM design pattern for view models with ObservableObject and RelayCommand
+- Follow the MVVM design pattern for view models with ObservableObject and RelayCommand
 - Use dependency injection for services
 - Include XML documentation for public interfaces and methods
 - Use PascalCase for class, method, and public property names
-- Use _camelCase for private fields with underscore prefix
+- Use _camelCase for private fields with an underscore prefix
 - Implement defensive programming with null checks for constructor parameters
 - Use standard exception handling with try/catch blocks around external operations
 - Prefer async/await over direct Task management
 - Organize files into clear namespaces (Core, Models, Services, ViewModels, etc.)
 - Use meaningful variable names that reflect their purpose
 - Keep methods focused and small with a single responsibility
+
+## UI Style Guidelines
+For detailed UI styling guidelines and examples, see: `src/UI/Windows/Styles/README.md`
diff --git a/src/UI/Windows/Styles/StyleGuide.md b/src/UI/Windows/Styles/StyleGuide.md
index ea4144c..3098fd6 100644
--- a/src/UI/Windows/Styles/StyleGuide.md
+++ b/src/UI/Windows/Styles/StyleGuide.md
@@ -66,6 +66,9 @@ Reusable styles for UI components.
 <!-- Text boxes -->
 <TextBox Style="{StaticResource TextBox.Standard}"/>
 
+<!-- Read-only text boxes (includes gray background, copy button, disabled context menu) -->
+<TextBox IsReadOnly="True" Style="{StaticResource TextBox.Standard}"/>
+
 <!-- Combo boxes -->
 <ComboBox Style="{StaticResource ComboBox.Standard}"/>
 
@@ -139,6 +142,40 @@ Templates for common layout patterns.
 - Mix explicit FontSize with typography styles
 - Use hardcoded colors (Red, Orange, etc.)
 - Create one-off styles without considering reusability
+- Override TextBox MinHeight in normal layouts (use design tokens instead)
+- Use StaticResource syntax within Thickness strings (e.g., `"0,0,0,{StaticResource Spacing.Medium}"`)
+
+#### Special Cases
+```xml
+<!-- Height-sensitive containers (DockPanel) - override TextBox MinHeight -->
+<TextBox Style="{StaticResource TextBox.Standard}"
+         MinHeight="0" Height="Auto" VerticalAlignment="Center"/>
+
+<!-- DataGrid with invisible selection -->
+<ui:DataGrid CanUserSortColumns="False">
+    <ui:DataGrid.RowStyle>
+        <Style TargetType="DataGridRow">
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="BorderBrush" Value="Transparent"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </ui:DataGrid.RowStyle>
+    <ui:DataGrid.CellStyle>
+        <Style TargetType="DataGridCell">
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="BorderBrush" Value="Transparent"/>
+                    <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </ui:DataGrid.CellStyle>
+</ui:DataGrid>
+```
 
 ### 3. Common Patterns
 

From 67f792c714bb8977f7d81df8956ef3537a8f2e78 Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Sat, 28 Jun 2025 10:52:32 -0400
Subject: [PATCH 10/12] Include UI style guidelines

---
 docs/CLAUDE.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/CLAUDE.md b/docs/CLAUDE.md
index 0b0fad9..b66db58 100644
--- a/docs/CLAUDE.md
+++ b/docs/CLAUDE.md
@@ -29,4 +29,11 @@
 - Keep methods focused and small with a single responsibility
 
 ## UI Style Guidelines
-For detailed UI styling guidelines and examples, see: `src/UI/Windows/Styles/README.md`
+- **Always use standard styles** - Apply predefined styles from the design system instead of inline properties
+- **Use design tokens for spacing** - Reference `{StaticResource Margin.Card}` instead of hardcoding values
+- **Apply semantic colors** - Use `{StaticResource Brush.Error}` instead of hardcoded colors like "Red"
+- **Follow the style hierarchy** - Check ComponentStyles.xaml and LayoutTemplates.xaml before creating custom styles
+- **Update existing code** - When modifying files, replace inline styling with standard styles
+- **Create reusable patterns** - If you find yourself repeating XAML structures, consider adding a new style or template
+
+For detailed UI styling guidelines and examples, see: `src/UI/Windows/Styles/StyleGuide.md`

From 5d00b84d1572a1aef1831d2b99e28b15df77a1dc Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Sat, 28 Jun 2025 12:26:43 -0400
Subject: [PATCH 11/12] Update the Connection Page UI layout

---
 src/Core/Resources/Resources.resx             |   8 +
 src/UI/Windows/Styles/ComponentStyles.xaml    |  10 +-
 src/UI/Windows/Views/Pages/ConnectPage.xaml   | 323 ++++++++----------
 .../Windows/Views/Pages/ConnectPage.xaml.cs   |  85 ++++-
 4 files changed, 227 insertions(+), 199 deletions(-)

diff --git a/src/Core/Resources/Resources.resx b/src/Core/Resources/Resources.resx
index bd8b910..38473df 100644
--- a/src/Core/Resources/Resources.resx
+++ b/src/Core/Resources/Resources.resx
@@ -219,6 +219,14 @@
     <value>Baud Rate</value>
     <comment>Label for baud rate selection</comment>
   </data>
+  <data name="Connect_ConnectionSettings" xml:space="preserve">
+    <value>Connection Settings</value>
+    <comment>Header for connection settings section</comment>
+  </data>
+  <data name="Connect_SecuritySettings" xml:space="preserve">
+    <value>Security Settings</value>
+    <comment>Header for security settings section</comment>
+  </data>
   <data name="Connect_Address" xml:space="preserve">
     <value>Address</value>
     <comment>Label for device address input</comment>
diff --git a/src/UI/Windows/Styles/ComponentStyles.xaml b/src/UI/Windows/Styles/ComponentStyles.xaml
index 7095983..811d27a 100644
--- a/src/UI/Windows/Styles/ComponentStyles.xaml
+++ b/src/UI/Windows/Styles/ComponentStyles.xaml
@@ -159,13 +159,13 @@
         </Style.Triggers>
     </Style>
     
-    <Style x:Key="ComboBox.Standard" TargetType="ComboBox">
+    <Style x:Key="ComboBox.Standard" TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
         <Setter Property="MinHeight" Value="{StaticResource Control.Height.Medium}"/>
         <Setter Property="Margin" Value="{StaticResource Margin.Control}"/>
         <Setter Property="MinWidth" Value="{StaticResource Control.Width.Medium}"/>
     </Style>
     
-    <Style x:Key="NumberBox.Standard" TargetType="ui:NumberBox">
+    <Style x:Key="NumberBox.Standard" TargetType="ui:NumberBox" BasedOn="{StaticResource {x:Type ui:NumberBox}}">
         <Setter Property="MinHeight" Value="{StaticResource Control.Height.Medium}"/>
         <Setter Property="Margin" Value="{StaticResource Margin.Control}"/>
         <Setter Property="MinWidth" Value="{StaticResource Control.Width.Small}"/>
@@ -195,8 +195,10 @@
     </Style>
     
     <Style x:Key="Section.Header" TargetType="ui:TextBlock">
-        <Setter Property="FontTypography" Value="Subtitle"/>
-        <Setter Property="Margin" Value="0,0,0,16"/>
+        <Setter Property="FontTypography" Value="BodyStrong"/>
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Margin" Value="0,0,0,12"/>
         <Setter Property="TextWrapping" Value="Wrap"/>
     </Style>
     
diff --git a/src/UI/Windows/Views/Pages/ConnectPage.xaml b/src/UI/Windows/Views/Pages/ConnectPage.xaml
index 6dc0246..4ea914c 100644
--- a/src/UI/Windows/Views/Pages/ConnectPage.xaml
+++ b/src/UI/Windows/Views/Pages/ConnectPage.xaml
@@ -6,7 +6,6 @@
 	  xmlns:pages="clr-namespace:OSDPBench.Windows.Views.Pages"
 	  xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
 	  xmlns:converters="clr-namespace:OSDPBench.Windows.Converters"
-	  xmlns:controls="clr-namespace:OSDPBench.Windows.Views.Controls"
 	  xmlns:markup="clr-namespace:OSDPBench.Windows.Markup"
 	  mc:Ignorable="d" 
 	  d:DataContext="{d:DesignInstance pages:ConnectPage,
@@ -30,27 +29,20 @@
                               Text="{markup:Localize Connect_SerialPortSelection}"
                               TextWrapping="Wrap"
                               Margin="0,0,0,10"/>
-                <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                
-                <!-- Serial Port Selection -->
-                <StackPanel Grid.Column="0" Orientation="Vertical">
+                <StackPanel Orientation="Vertical">
                     <Label Content="{markup:Localize Connect_SerialPort}"
                            Style="{StaticResource Label.Standard}"
                            Target="{Binding ElementName=SerialPortComboBox}" />
-                    <ComboBox x:Name="SerialPortComboBox"
-                              ItemsSource="{Binding ViewModel.AvailableSerialPorts }"
-                              DisplayMemberPath="Name"
-                              SelectedItem="{Binding ViewModel.SelectedSerialPort}"/>
-                </StackPanel>
-                
-                <!-- USB Status Display -->
-                <TextBlock Grid.Column="1"
-                           Text="{Binding ViewModel.UsbStatusText}"
-                           VerticalAlignment="Center"
+                    <DockPanel>
+                        <ComboBox x:Name="SerialPortComboBox"
+                                  Style="{StaticResource ComboBox.Standard}"
+                                  ItemsSource="{Binding ViewModel.AvailableSerialPorts }"
+                                  DisplayMemberPath="Name"
+                                  SelectedItem="{Binding ViewModel.SelectedSerialPort}"
+                                  MinWidth="200"
+                                  MaxWidth="400"/>
+                        <TextBlock Text="{Binding ViewModel.UsbStatusText}"
+                                   VerticalAlignment="Center"
                            Margin="10,0,0,0">
                     <TextBlock.Style>
                         <Style TargetType="TextBlock" BasedOn="{StaticResource Text.Caption}">
@@ -62,7 +54,8 @@
                         </Style>
                     </TextBlock.Style>
                 </TextBlock>
-            </Grid>
+                    </DockPanel>
+                </StackPanel>
             </StackPanel>
         </Border>
         <Border Style="{StaticResource Card.Bordered}">
@@ -95,184 +88,146 @@
                         </ui:TextBlock.Text>
                     </ui:TextBlock>
 
-                    <ComboBox Name="ConnectionTypeComboBox"
-						Grid.Row="0"
-						Grid.RowSpan="2"
-						Grid.Column="1"
-						Margin="0,0,16,0"
-						ItemsSource="{Binding ConnectionTypes }"
-						SelectedIndex="{Binding SelectedConnectionTypeIndex, Mode=TwoWay}"/>
-                </Grid>
-                
-                <Grid 
-					Visibility="{Binding ElementName=ConnectionTypeComboBox, Path=SelectedIndex, Converter={StaticResource IndexToVisibilityConverter}, ConverterParameter=0, Mode=OneWay}">
-                    <StackPanel Orientation="Vertical">
-                        <ui:TextBlock Style="{StaticResource Text.Body}"
-							Margin="10 5"
-							HorizontalAlignment="Center"
-							Text="{markup:Localize Connect_DiscoveryWarning}" 
-							TextWrapping="Wrap"/>
-                        <StackPanel Orientation="Horizontal"
-									HorizontalAlignment="Left">
-                            <ui:Button  Content="{markup:Localize Connect_StartDiscovery}"
-										Margin="10 5"
-										HorizontalAlignment="Center"
-										Command="{Binding ViewModel.DiscoverDeviceCommand}">
-                                <ui:Button.Style>
-                                    <Style TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
-                                        <Setter Property="Visibility" Value="Visible"/>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewModel.StatusLevel}" Value="Connected">
-                                                <Setter Property="Visibility" Value="Collapsed"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </ui:Button.Style>
-                            </ui:Button>
-                            <ui:Button  Content="{markup:Localize Connect_CancelDiscovery}"
-										Margin="10 5"
-										HorizontalAlignment="Center"
-										Command="{Binding ViewModel.DiscoverDeviceCancelCommand}">
-                                <ui:Button.Style>
-                                    <Style TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
-                                        <Setter Property="Visibility" Value="Visible"/>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewModel.StatusLevel}" Value="Connected">
-                                                <Setter Property="Visibility" Value="Collapsed"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </ui:Button.Style>
-                            </ui:Button>
-                            <ui:Button  Content="{markup:Localize Connect_Disconnect}"
-										Margin="10 5"
-										HorizontalAlignment="Center"
-										Command="{Binding ViewModel.DisconnectDeviceCommand}">
-                                <ui:Button.Style>
-                                    <Style TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
-                                        <Setter Property="Visibility" Value="Collapsed"/>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewModel.StatusLevel}" Value="Connected">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </ui:Button.Style>
-                            </ui:Button>
-                        </StackPanel>
+                    <StackPanel Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Grid.Column="1"
+                                Orientation="Horizontal"
+                                HorizontalAlignment="Right">
+                        
+                        <ui:Button Content="{markup:Localize Connect_Connect}"
+                                   Command="{Binding ViewModel.ConnectDeviceCommand}"
+                                   Margin="0,0,8,0"
+                                   Style="{StaticResource Button.Primary}"
+                                   Visibility="{Binding ConnectVisibility}"/>
+                        
+                        <ui:Button Content="{markup:Localize Connect_StartDiscovery}"
+                                   Command="{Binding ViewModel.DiscoverDeviceCommand}"
+                                   Margin="0,0,8,0"
+                                   Style="{StaticResource Button.Primary}"
+                                   Visibility="{Binding StartDiscoveryVisibility}"/>
+                        
+                        <ui:Button Content="{markup:Localize Connect_CancelDiscovery}"
+                                   Command="{Binding ViewModel.DiscoverDeviceCancelCommand}"
+                                   Margin="0,0,8,0"
+                                   Style="{StaticResource Button.Secondary}"
+                                   Visibility="{Binding CancelDiscoveryVisibility}"/>
+                        
+                        <ui:Button Content="{markup:Localize Connect_Disconnect}"
+                                   Command="{Binding ViewModel.DisconnectDeviceCommand}"
+                                   Margin="0,0,8,0"
+                                   Style="{StaticResource Button.Secondary}"
+                                   Visibility="{Binding DisconnectVisibility}"/>
+
+                        <ComboBox Name="ConnectionTypeComboBox"
+                                  ItemsSource="{Binding ConnectionTypes }"
+                                  SelectedIndex="{Binding SelectedConnectionTypeIndex, Mode=TwoWay}"/>
                     </StackPanel>
                 </Grid>
+                
+                <!-- Discovery Warning (only shown when Discovery mode is selected) -->
+                <ui:TextBlock Style="{StaticResource Text.Body}"
+					  Margin="10 5"
+					  HorizontalAlignment="Center"
+					  Text="{markup:Localize Connect_DiscoveryWarning}" 
+					  TextWrapping="Wrap"
+					  Visibility="{Binding ElementName=ConnectionTypeComboBox, Path=SelectedIndex, Converter={StaticResource IndexToVisibilityConverter}, ConverterParameter=0, Mode=OneWay}"/>
 
-                <Grid
-					Visibility="{Binding ElementName=ConnectionTypeComboBox, Path=SelectedIndex, Converter={StaticResource IndexToVisibilityConverter}, ConverterParameter=1, Mode=OneWay}">
-                    <StackPanel Orientation="Vertical">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Vertical">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" 
+                             HorizontalScrollBarVisibility="Disabled"
+                             Visibility="{Binding ElementName=ConnectionTypeComboBox, Path=SelectedIndex, Converter={StaticResource IndexToVisibilityConverter}, ConverterParameter=1, Mode=OneWay}">
+                <StackPanel Orientation="Vertical"
+                           Margin="0,0,16,0">
+                    
+                    <!-- Connection Settings Section -->
+                    <StackPanel Orientation="Vertical" Margin="0,0,0,16">
+                        <ui:TextBlock FontTypography="BodyStrong"
+                                      Text="{markup:Localize Connect_ConnectionSettings}"
+                                      FontSize="16"
+                                      FontWeight="SemiBold"
+                                      Margin="0,0,0,12"/>
+                        
+                        <WrapPanel Orientation="Horizontal">
+                            <StackPanel Orientation="Vertical" Margin="0,0,16,0">
                                 <Label Content="{markup:Localize Connect_BaudRate}"
                                        Style="{StaticResource Label.Standard}"
-										   Target="{Binding ElementName=BaudRateComboBox}" />
+                                       Target="{Binding ElementName=BaudRateComboBox}" />
                                 <ComboBox Name="BaudRateComboBox"
-										  Margin="0 0 20 0"
+                                          Style="{StaticResource ComboBox.Standard}"
+                                          Width="200"
                                           ItemsSource="{Binding ViewModel.AvailableBaudRates}"
-                                          SelectedItem="{Binding  Path=ViewModel.SelectedBaudRate, Mode=TwoWay}"/>
+                                          SelectedItem="{Binding Path=ViewModel.SelectedBaudRate, Mode=TwoWay}"/>
                             </StackPanel>
-                            <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Vertical">
+                            
+                            <StackPanel Orientation="Vertical">
                                 <Label Content="{markup:Localize Connect_Address}"
                                        Style="{StaticResource Label.Standard}"
-										   Target="{Binding ElementName=AddressNumberBox}" />
+                                       Target="{Binding ElementName=AddressNumberBox}" />
                                 <ui:NumberBox Name="AddressNumberBox"
-											  Value="{Binding Path=ViewModel.SelectedAddress, Mode=TwoWay}"
-											  TextChanged="AddressNumberBox_OnTextChanged"
-											  ValueChanged="AddressNumberBox_OnValueChanged"
-											  Margin="0 0 20 0"
+                                              Style="{StaticResource NumberBox.Standard}"
+                                              Value="{Binding Path=ViewModel.SelectedAddress, Mode=TwoWay}"
+                                              TextChanged="AddressNumberBox_OnTextChanged"
+                                              ValueChanged="AddressNumberBox_OnValueChanged"
                                               Minimum="0"
-											  Maximum="127"
-                                              ClearButtonEnabled="False"
-											  MaxDecimalPlaces="0"/>
+                                              Maximum="127"
+                                              Width="120"
+                                              HorizontalAlignment="Left"/>
                             </StackPanel>
-                            <StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" 
-                                        Margin="0,5,0,0"
-                                        Orientation="Vertical">
-	                            <StackPanel Orientation="Horizontal">
-		                            <CheckBox Name="UseSecureChannelCheckBox"
-		                                      Content="{markup:Localize Connect_UseSecureChannel}" 
-		                                      IsChecked="{Binding Path=ViewModel.UseSecureChannel,  Mode=TwoWay}"/>
-		                            
-		                            <CheckBox Name="UseDefaultKeyCheckBox"
-		                                      Content="{markup:Localize Connect_UseDefaultKey}" 
-		                                      Margin="10,0,0,0"
-		                                      IsEnabled="{Binding ElementName=UseSecureChannelCheckBox, Path=IsChecked}"
-		                                      IsChecked="{Binding  Path=ViewModel.UseDefaultKey,  Mode=TwoWay}"/>
-	                            </StackPanel>
-	                           
-	                            <StackPanel Orientation="Vertical">
-		                            <Label Content="{markup:Localize Connect_SecurityKey}"
-		                                   Style="{StaticResource Label.Standard}"
-		                                   Target="{Binding ElementName=AddressNumberBox}" />
-                                    <TextBox Text="{Binding Path=ViewModel.SecurityKey,  Mode=TwoWay}">
-                                        <TextBox.Style>
-                                            <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-                                                <!-- Only add the specific triggers needed -->
-                                                <Setter Property="IsEnabled" Value="False"/>
-                                                <Style.Triggers>
-                                                    <MultiDataTrigger>
-                                                        <MultiDataTrigger.Conditions>
-                                                            <Condition Binding="{Binding ElementName=UseSecureChannelCheckBox, Path=IsChecked}" Value="True"/>
-                                                            <Condition Binding="{Binding ElementName=UseDefaultKeyCheckBox, Path=IsChecked}" Value="False"/>
-                                                        </MultiDataTrigger.Conditions>
-                                                        <Setter Property="IsEnabled" Value="True"/>
-                                                    </MultiDataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBox.Style>
-                                    </TextBox>
-                                </StackPanel>
-                            </StackPanel>
-                            
-                            <ui:Button Grid.Row="1" Grid.Column="2"  Content="{markup:Localize Connect_Connect}"
-                                       Margin="10 0"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Bottom"
-                                       Command="{Binding ViewModel.ConnectDeviceCommand}">
-                                <ui:Button.Style>
-                                    <Style TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
-                                        <Setter Property="Visibility" Value="Visible"/>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewModel.StatusLevel}" Value="Connected">
-                                                <Setter Property="Visibility" Value="Collapsed"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </ui:Button.Style>
-                            </ui:Button>
-                            <ui:Button Grid.Row="1" Grid.Column="2"  Content="{markup:Localize Connect_Disconnect}"
-                                       Margin="10 0"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Bottom"
-                                       Command="{Binding ViewModel.DisconnectDeviceCommand}">
-                                <ui:Button.Style>
-                                    <Style TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
-                                        <Setter Property="Visibility" Value="Collapsed"/>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewModel.StatusLevel}" Value="Connected">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </ui:Button.Style>
-                            </ui:Button>
-                        </Grid>
+                        </WrapPanel>
                     </StackPanel>
-                </Grid>
+                    
+                    <!-- Security Settings Section -->
+                    <Border Style="{StaticResource Card.Bordered}" 
+                            Padding="16"
+                            Margin="0,0,0,16">
+                        <StackPanel Orientation="Vertical">
+                            <ui:TextBlock FontTypography="BodyStrong"
+                                          Text="{markup:Localize Connect_SecuritySettings}"
+                                          FontSize="16"
+                                          FontWeight="SemiBold"
+                                          Margin="0,0,0,12"/>
+                            
+                            <WrapPanel Orientation="Horizontal" Margin="0,0,0,8">
+                                <CheckBox Name="UseSecureChannelCheckBox"
+                                          Content="{markup:Localize Connect_UseSecureChannel}" 
+                                          IsChecked="{Binding Path=ViewModel.UseSecureChannel, Mode=TwoWay}"
+                                          Margin="0,0,16,4"/>
+                                
+                                <CheckBox Name="UseDefaultKeyCheckBox"
+                                          Content="{markup:Localize Connect_UseDefaultKey}" 
+                                          IsEnabled="{Binding ElementName=UseSecureChannelCheckBox, Path=IsChecked}"
+                                          IsChecked="{Binding Path=ViewModel.UseDefaultKey, Mode=TwoWay}"
+                                          Margin="0,0,0,4"/>
+                            </WrapPanel>
+                            
+                            <StackPanel Orientation="Vertical">
+                                <Label Content="{markup:Localize Connect_SecurityKey}"
+                                       Style="{StaticResource Label.Standard}"
+                                       Target="{Binding ElementName=SecurityKeyTextBox}" />
+                                <TextBox Name="SecurityKeyTextBox"
+                                         Text="{Binding Path=ViewModel.SecurityKey, Mode=TwoWay}"
+                                         MaxWidth="600"
+                                         HorizontalAlignment="Stretch">
+                                    <TextBox.Style>
+                                        <Style TargetType="TextBox" BasedOn="{StaticResource TextBox.Standard}">
+                                            <Setter Property="IsEnabled" Value="False"/>
+                                            <Style.Triggers>
+                                                <MultiDataTrigger>
+                                                    <MultiDataTrigger.Conditions>
+                                                        <Condition Binding="{Binding ElementName=UseSecureChannelCheckBox, Path=IsChecked}" Value="True"/>
+                                                        <Condition Binding="{Binding ElementName=UseDefaultKeyCheckBox, Path=IsChecked}" Value="False"/>
+                                                    </MultiDataTrigger.Conditions>
+                                                    <Setter Property="IsEnabled" Value="True"/>
+                                                </MultiDataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBox.Style>
+                                </TextBox>
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+                    
+                </StackPanel>
+                </ScrollViewer>
 
                 <TextBlock 
 					Margin="10 5"
diff --git a/src/UI/Windows/Views/Pages/ConnectPage.xaml.cs b/src/UI/Windows/Views/Pages/ConnectPage.xaml.cs
index 03309a6..d9c98a3 100644
--- a/src/UI/Windows/Views/Pages/ConnectPage.xaml.cs
+++ b/src/UI/Windows/Views/Pages/ConnectPage.xaml.cs
@@ -1,5 +1,6 @@
 using System.Windows.Controls;
 using System.ComponentModel;
+using System.Windows;
 using OSDPBench.Core.ViewModels.Pages;
 using Wpf.Ui.Abstractions.Controls;
 using Wpf.Ui.Controls;
@@ -17,21 +18,29 @@ public ConnectPage(ConnectViewModel viewModel)
         DataContext = this;
 
         // Subscribe to culture changes
-        OSDPBench.Core.Resources.Resources.PropertyChanged += OnResourcesPropertyChanged;
+        Core.Resources.Resources.PropertyChanged += OnResourcesPropertyChanged;
+
+        // Subscribe to StatusLevel changes to update button visibility
+        ViewModel.PropertyChanged += OnViewModelPropertyChanged;
 
         InitializeComponent();
-        
+
         // Set up loaded event to ensure proper initialization
         this.Loaded += OnPageLoaded;
     }
 
     public ConnectViewModel ViewModel { get; }
-        
-    public IEnumerable<string> ConnectionTypes => [OSDPBench.Core.Resources.Resources.GetString("ConnectionType_Discover"), OSDPBench.Core.Resources.Resources.GetString("ConnectionType_Manual")];
-    
+
+    public IEnumerable<string> ConnectionTypes =>
+    [
+        Core.Resources.Resources.GetString("ConnectionType_Discover"),
+        Core.Resources.Resources.GetString("ConnectionType_Manual")
+    ];
+
     private int _selectedConnectionTypeIndex = -1; // Start with -1 to ensure property change fires
-    public int SelectedConnectionTypeIndex 
-    { 
+
+    public int SelectedConnectionTypeIndex
+    {
         get => _selectedConnectionTypeIndex;
         set
         {
@@ -39,26 +48,80 @@ public int SelectedConnectionTypeIndex
             {
                 _selectedConnectionTypeIndex = value;
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SelectedConnectionTypeIndex)));
+                UpdateButtonVisibility();
             }
         }
     }
 
+    // Button visibility properties
+    public Visibility ConnectVisibility => CalculateConnectVisibility();
+    public Visibility DisconnectVisibility => CalculateDisconnectVisibility();
+    public Visibility StartDiscoveryVisibility => CalculateStartDiscoveryVisibility();
+    public Visibility CancelDiscoveryVisibility => CalculateCancelDiscoveryVisibility();
+
+    private Visibility CalculateConnectVisibility()
+    {
+        // Show the Connect button when Manual mode is selected and not connected
+        return SelectedConnectionTypeIndex == 1 && ViewModel.StatusLevel != StatusLevel.Connected
+            ? Visibility.Visible
+            : Visibility.Collapsed;
+    }
+
+    private Visibility CalculateDisconnectVisibility()
+    {
+        // Show the Disconnect button when connected
+        return ViewModel.StatusLevel == StatusLevel.Connected
+            ? Visibility.Visible
+            : Visibility.Collapsed;
+    }
+
+    private Visibility CalculateStartDiscoveryVisibility()
+    {
+        return SelectedConnectionTypeIndex == 0 && ViewModel.StatusLevel is not StatusLevel.Discovering
+            and not StatusLevel.Discovered and not StatusLevel.Connected
+            ? Visibility.Visible
+            : Visibility.Collapsed;
+    }
+
+    private Visibility CalculateCancelDiscoveryVisibility()
+    {
+        return SelectedConnectionTypeIndex == 0 && ViewModel.StatusLevel == StatusLevel.Discovering
+            ? Visibility.Visible
+            : Visibility.Collapsed;
+    }
+
     private void OnResourcesPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         // When culture changes, notify that ConnectionTypes has changed
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ConnectionTypes)));
-        
+
         // Force the ComboBox to refresh its selection
         var currentIndex = SelectedConnectionTypeIndex;
         SelectedConnectionTypeIndex = -1;
         SelectedConnectionTypeIndex = currentIndex;
     }
 
+    private void OnViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(ViewModel.StatusLevel))
+        {
+            UpdateButtonVisibility();
+        }
+    }
+
+    private void UpdateButtonVisibility()
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ConnectVisibility)));
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(DisconnectVisibility)));
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StartDiscoveryVisibility)));
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CancelDiscoveryVisibility)));
+    }
+
     public event PropertyChangedEventHandler? PropertyChanged;
-    
-    private void OnPageLoaded(object sender, System.Windows.RoutedEventArgs e)
+
+    private void OnPageLoaded(object sender, RoutedEventArgs e)
     {
-        // Ensure default selection is set when page is loaded
+        // Ensure a default selection is set when a page is loaded
         if (SelectedConnectionTypeIndex == -1)
         {
             SelectedConnectionTypeIndex = 0;

From 92f0da61d39c6579675608eb0dc506bc26b061f0 Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Sat, 28 Jun 2025 12:50:47 -0400
Subject: [PATCH 12/12] Fix activity blinking when connected as secure channel

---
 src/Core/ViewModels/Pages/ConnectViewModel.cs |  7 +++---
 src/Core/ViewModels/Pages/ManageViewModel.cs  | 23 ++++++++---------
 src/Core/ViewModels/Pages/MonitorViewModel.cs | 25 +++++++++----------
 src/UI/Windows/Views/Windows/MainWindow.xaml  |  2 +-
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/Core/ViewModels/Pages/ConnectViewModel.cs b/src/Core/ViewModels/Pages/ConnectViewModel.cs
index 3e6cbf6..1ee8cdb 100644
--- a/src/Core/ViewModels/Pages/ConnectViewModel.cs
+++ b/src/Core/ViewModels/Pages/ConnectViewModel.cs
@@ -63,13 +63,12 @@ public ConnectViewModel(IDialogService dialogService, IDeviceManagementService d
 
     private void OnDeviceManagementServiceOnTraceEntryReceived(object? sender, TraceEntry traceEntry)
     {
-        if (_deviceManagementService.IsUsingSecureChannel) return;
-
+        // Update activity indicators based on raw trace entry direction (works for encrypted packets too)
+        UpdateActivityIndicators(traceEntry.Direction);
+        
         PacketTraceEntry? packetTraceEntry = BuildPacketTraceEntry(traceEntry);
         if (packetTraceEntry == null) return;
         
-        UpdateActivityIndicators(packetTraceEntry.Direction);
-        
         _lastPacketEntry = packetTraceEntry;
     }
 
diff --git a/src/Core/ViewModels/Pages/ManageViewModel.cs b/src/Core/ViewModels/Pages/ManageViewModel.cs
index d022e49..3148582 100644
--- a/src/Core/ViewModels/Pages/ManageViewModel.cs
+++ b/src/Core/ViewModels/Pages/ManageViewModel.cs
@@ -196,7 +196,17 @@ private void DeviceManagementServiceOnKeypadReadReceived(object? sender, string
     
     private void OnDeviceManagementServiceOnTraceEntryReceived(object? sender, TraceEntry traceEntry)
     {
-        if (_deviceManagementService.IsUsingSecureChannel) return;
+        // Update activity indicators based on raw trace entry direction (works for encrypted packets too)
+        switch (traceEntry.Direction)
+        {
+            // Flash the appropriate LED based on a direction
+            case TraceDirection.Output:
+                LastTxActiveTime = DateTime.Now;
+                break;
+            case TraceDirection.Input or TraceDirection.Trace:
+                LastRxActiveTime = DateTime.Now;
+                break;
+        }
 
         var build = new PacketTraceEntryBuilder();
         PacketTraceEntry packetTraceEntry;
@@ -208,17 +218,6 @@ private void OnDeviceManagementServiceOnTraceEntryReceived(object? sender, Trace
         {
             return;
         }
-
-        switch (packetTraceEntry.Direction)
-        {
-            // Flash the appropriate LED based on a direction
-            case TraceDirection.Output:
-                LastTxActiveTime = DateTime.Now;
-                break;
-            case TraceDirection.Input or TraceDirection.Trace:
-                LastRxActiveTime = DateTime.Now;
-                break;
-        }
         
         _lastPacketEntry = packetTraceEntry;
     }
diff --git a/src/Core/ViewModels/Pages/MonitorViewModel.cs b/src/Core/ViewModels/Pages/MonitorViewModel.cs
index 6d60cfc..8b08c18 100644
--- a/src/Core/ViewModels/Pages/MonitorViewModel.cs
+++ b/src/Core/ViewModels/Pages/MonitorViewModel.cs
@@ -53,8 +53,18 @@ private void InitializePollingMetrics()
     private void OnDeviceManagementServiceOnTraceEntryReceived(object? _, TraceEntry traceEntry)
     {
         UsingSecureChannel = _deviceManagementService.IsUsingSecureChannel;
-        
-        if (UsingSecureChannel) return;
+
+        // Update activity indicators based on raw trace entry direction (works for encrypted packets too)
+        switch (traceEntry.Direction)
+        {
+            // Flash appropriate LED based on direction
+            case Output:
+                LastTxActiveTime = DateTime.Now;
+                break;
+            case Input or Trace:
+                LastRxActiveTime = DateTime.Now;
+                break;
+        }
 
         var build = new PacketTraceEntryBuilder();
         PacketTraceEntry packetTraceEntry;
@@ -67,17 +77,6 @@ private void OnDeviceManagementServiceOnTraceEntryReceived(object? _, TraceEntry
             return;
         }
 
-        switch (packetTraceEntry.Direction)
-        {
-            // Flash appropriate LED based on direction
-            case Output:
-                LastTxActiveTime = DateTime.Now;
-                break;
-            case Input or Trace:
-                LastRxActiveTime = DateTime.Now;
-                break;
-        }
-
         bool notDisplaying = packetTraceEntry.Packet.CommandType == CommandType.Poll ||
                              _lastPacketEntry?.Packet.CommandType == CommandType.Poll &&
                              packetTraceEntry.Packet.ReplyType == ReplyType.Ack;
diff --git a/src/UI/Windows/Views/Windows/MainWindow.xaml b/src/UI/Windows/Views/Windows/MainWindow.xaml
index c8f6fa2..d79a24c 100644
--- a/src/UI/Windows/Views/Windows/MainWindow.xaml
+++ b/src/UI/Windows/Views/Windows/MainWindow.xaml
@@ -14,7 +14,7 @@
         d:DataContext="{d:DesignInstance local:MainWindow, IsDesignTimeCreatable=True}"
         d:DesignHeight="450"
         d:DesignWidth="800"
-        Height="600" Width="800">
+        Height="800" Width="800">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />