diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 711faa4..2f891ca 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -216,14 +216,14 @@
     <Compile Include="Converter\PipeLineValueConverter.cs" />
     <Compile Include="Converter\MuteStateConverter.cs" />
     <Compile Include="Converter\SignalIntensityConverter.cs" />
-    <Compile Include="Converter\SoundParamValueConverter.cs"/>
+      <Compile Include="Converter\SoundParamValueConverter.cs"/>
     <Compile Include="Converter\StepButtonStateConverter.cs" />
-    <Compile Include="Converter\WorkModeConverter.cs"/>
+      <Compile Include="Converter\WorkModeConverter.cs"/>
     <Compile Include="DataService\ApplicationDataServiceImpl.cs" />
     <Compile Include="DataService\AudioServiceImpl.cs" />
-    <Compile Include="DataService\CommandServiceImpl.cs"/>
+      <Compile Include="DataService\CommandServiceImpl.cs"/>
     <Compile Include="DataService\IAudioService.cs" />
-    <Compile Include="DataService\ICommandService.cs"/>
+      <Compile Include="DataService\ICommandService.cs"/>
     <Compile Include="DataService\ISerialPortService.cs" />
     <Compile Include="DataService\SerialPortServiceImpl.cs" />
     <Compile Include="Dialog\AddSoundSpeedDialog.xaml.cs">
@@ -261,13 +261,13 @@
     </Compile>
     <Compile Include="Events\CorrelatorDataEventArgs.cs" />
     <Compile Include="Events\ResponseIndexEventArgs.cs" />
-    <Compile Include="Events\DeviceStatusEventArgs.cs"/>
-    <Compile Include="Model\CommandModel.cs"/>
+      <Compile Include="Events\DeviceStatusEventArgs.cs"/>
+      <Compile Include="Model\CommandModel.cs"/>
     <Compile Include="Model\ResponseModel.cs" />
-    <Compile Include="Model\SampleRateModel.cs"/>
+      <Compile Include="Model\SampleRateModel.cs"/>
     <Compile Include="ViewModels\ApplicationLogViewModel.cs" />
-    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\ApplicationLogView.xaml.cs">
       <DependentUpon>ApplicationLogView.xaml</DependentUpon>
     </Compile>
@@ -323,10 +323,10 @@
     <Compile Include="ViewModels\DetectNoiseDialogViewModel.cs" />
     <Compile Include="ViewModels\EditSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
+      <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
     <Compile Include="ViewModels\NoiseWaveViewViewModel.cs" />
     <Compile Include="ViewModels\NumericKeypadDialogViewModel.cs" />
-    <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
+      <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\SimplyAuditionDialogViewModel.cs" />
     <Compile Include="ViewModels\SoundSpeedDialogViewModel.cs" />
     <Compile Include="Views\BigPictureView.xaml.cs">
@@ -343,15 +343,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\DetectNoiseDialog.xaml" />
-    <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
     <Page Include="Dialog\EditSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ImportHydrophoneDataDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\LoadingDialog.xaml" />
-    <Page Include="Dialog\PictureFileDialog.xaml"/>
-    <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\PictureFileDialog.xaml"/>
+      <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Style\DataGridCellCustomStyle.xaml"/>
+      <Page Include="Style\DataGridRowCustomStyle.xaml">
+          <SubType>Designer</SubType>
+          <Generator>MSBuild:Compile</Generator>
+      </Page>
     <Page Include="Views\ApplicationLogView.xaml" />
     <Page Include="Views\NoiseWaveView.xaml">
       <SubType>Designer</SubType>

diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 711faa4..2f891ca 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -216,14 +216,14 @@
     <Compile Include="Converter\PipeLineValueConverter.cs" />
     <Compile Include="Converter\MuteStateConverter.cs" />
     <Compile Include="Converter\SignalIntensityConverter.cs" />
-    <Compile Include="Converter\SoundParamValueConverter.cs"/>
+      <Compile Include="Converter\SoundParamValueConverter.cs"/>
     <Compile Include="Converter\StepButtonStateConverter.cs" />
-    <Compile Include="Converter\WorkModeConverter.cs"/>
+      <Compile Include="Converter\WorkModeConverter.cs"/>
     <Compile Include="DataService\ApplicationDataServiceImpl.cs" />
     <Compile Include="DataService\AudioServiceImpl.cs" />
-    <Compile Include="DataService\CommandServiceImpl.cs"/>
+      <Compile Include="DataService\CommandServiceImpl.cs"/>
     <Compile Include="DataService\IAudioService.cs" />
-    <Compile Include="DataService\ICommandService.cs"/>
+      <Compile Include="DataService\ICommandService.cs"/>
     <Compile Include="DataService\ISerialPortService.cs" />
     <Compile Include="DataService\SerialPortServiceImpl.cs" />
     <Compile Include="Dialog\AddSoundSpeedDialog.xaml.cs">
@@ -261,13 +261,13 @@
     </Compile>
     <Compile Include="Events\CorrelatorDataEventArgs.cs" />
     <Compile Include="Events\ResponseIndexEventArgs.cs" />
-    <Compile Include="Events\DeviceStatusEventArgs.cs"/>
-    <Compile Include="Model\CommandModel.cs"/>
+      <Compile Include="Events\DeviceStatusEventArgs.cs"/>
+      <Compile Include="Model\CommandModel.cs"/>
     <Compile Include="Model\ResponseModel.cs" />
-    <Compile Include="Model\SampleRateModel.cs"/>
+      <Compile Include="Model\SampleRateModel.cs"/>
     <Compile Include="ViewModels\ApplicationLogViewModel.cs" />
-    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\ApplicationLogView.xaml.cs">
       <DependentUpon>ApplicationLogView.xaml</DependentUpon>
     </Compile>
@@ -323,10 +323,10 @@
     <Compile Include="ViewModels\DetectNoiseDialogViewModel.cs" />
     <Compile Include="ViewModels\EditSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
+      <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
     <Compile Include="ViewModels\NoiseWaveViewViewModel.cs" />
     <Compile Include="ViewModels\NumericKeypadDialogViewModel.cs" />
-    <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
+      <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\SimplyAuditionDialogViewModel.cs" />
     <Compile Include="ViewModels\SoundSpeedDialogViewModel.cs" />
     <Compile Include="Views\BigPictureView.xaml.cs">
@@ -343,15 +343,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\DetectNoiseDialog.xaml" />
-    <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
     <Page Include="Dialog\EditSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ImportHydrophoneDataDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\LoadingDialog.xaml" />
-    <Page Include="Dialog\PictureFileDialog.xaml"/>
-    <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\PictureFileDialog.xaml"/>
+      <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Style\DataGridCellCustomStyle.xaml"/>
+      <Page Include="Style\DataGridRowCustomStyle.xaml">
+          <SubType>Designer</SubType>
+          <Generator>MSBuild:Compile</Generator>
+      </Page>
     <Page Include="Views\ApplicationLogView.xaml" />
     <Page Include="Views\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
diff --git a/Correlator/Dialog/AudioFileDialog.xaml b/Correlator/Dialog/AudioFileDialog.xaml
index 6092aea..af31760 100644
--- a/Correlator/Dialog/AudioFileDialog.xaml
+++ b/Correlator/Dialog/AudioFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:AudioFileDialogViewModel}"
     Loaded="AudioFileView_OnLoaded"
     Unloaded="AudioFileView_OnUnloaded"
@@ -38,11 +36,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding AudioFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -55,24 +55,28 @@
                     Width="1.5*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FileSource}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件来源"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -87,7 +91,8 @@
                                     hc:IconElement.Geometry="{StaticResource AudioGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.PlayAudioCommand, ElementName=TargetDataGrid}"
-                                    Content="播放" />
+                                    Content="播放"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"

diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 711faa4..2f891ca 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -216,14 +216,14 @@
     <Compile Include="Converter\PipeLineValueConverter.cs" />
     <Compile Include="Converter\MuteStateConverter.cs" />
     <Compile Include="Converter\SignalIntensityConverter.cs" />
-    <Compile Include="Converter\SoundParamValueConverter.cs"/>
+      <Compile Include="Converter\SoundParamValueConverter.cs"/>
     <Compile Include="Converter\StepButtonStateConverter.cs" />
-    <Compile Include="Converter\WorkModeConverter.cs"/>
+      <Compile Include="Converter\WorkModeConverter.cs"/>
     <Compile Include="DataService\ApplicationDataServiceImpl.cs" />
     <Compile Include="DataService\AudioServiceImpl.cs" />
-    <Compile Include="DataService\CommandServiceImpl.cs"/>
+      <Compile Include="DataService\CommandServiceImpl.cs"/>
     <Compile Include="DataService\IAudioService.cs" />
-    <Compile Include="DataService\ICommandService.cs"/>
+      <Compile Include="DataService\ICommandService.cs"/>
     <Compile Include="DataService\ISerialPortService.cs" />
     <Compile Include="DataService\SerialPortServiceImpl.cs" />
     <Compile Include="Dialog\AddSoundSpeedDialog.xaml.cs">
@@ -261,13 +261,13 @@
     </Compile>
     <Compile Include="Events\CorrelatorDataEventArgs.cs" />
     <Compile Include="Events\ResponseIndexEventArgs.cs" />
-    <Compile Include="Events\DeviceStatusEventArgs.cs"/>
-    <Compile Include="Model\CommandModel.cs"/>
+      <Compile Include="Events\DeviceStatusEventArgs.cs"/>
+      <Compile Include="Model\CommandModel.cs"/>
     <Compile Include="Model\ResponseModel.cs" />
-    <Compile Include="Model\SampleRateModel.cs"/>
+      <Compile Include="Model\SampleRateModel.cs"/>
     <Compile Include="ViewModels\ApplicationLogViewModel.cs" />
-    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\ApplicationLogView.xaml.cs">
       <DependentUpon>ApplicationLogView.xaml</DependentUpon>
     </Compile>
@@ -323,10 +323,10 @@
     <Compile Include="ViewModels\DetectNoiseDialogViewModel.cs" />
     <Compile Include="ViewModels\EditSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
+      <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
     <Compile Include="ViewModels\NoiseWaveViewViewModel.cs" />
     <Compile Include="ViewModels\NumericKeypadDialogViewModel.cs" />
-    <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
+      <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\SimplyAuditionDialogViewModel.cs" />
     <Compile Include="ViewModels\SoundSpeedDialogViewModel.cs" />
     <Compile Include="Views\BigPictureView.xaml.cs">
@@ -343,15 +343,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\DetectNoiseDialog.xaml" />
-    <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
     <Page Include="Dialog\EditSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ImportHydrophoneDataDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\LoadingDialog.xaml" />
-    <Page Include="Dialog\PictureFileDialog.xaml"/>
-    <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\PictureFileDialog.xaml"/>
+      <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Style\DataGridCellCustomStyle.xaml"/>
+      <Page Include="Style\DataGridRowCustomStyle.xaml">
+          <SubType>Designer</SubType>
+          <Generator>MSBuild:Compile</Generator>
+      </Page>
     <Page Include="Views\ApplicationLogView.xaml" />
     <Page Include="Views\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
diff --git a/Correlator/Dialog/AudioFileDialog.xaml b/Correlator/Dialog/AudioFileDialog.xaml
index 6092aea..af31760 100644
--- a/Correlator/Dialog/AudioFileDialog.xaml
+++ b/Correlator/Dialog/AudioFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:AudioFileDialogViewModel}"
     Loaded="AudioFileView_OnLoaded"
     Unloaded="AudioFileView_OnUnloaded"
@@ -38,11 +36,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding AudioFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -55,24 +55,28 @@
                     Width="1.5*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FileSource}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件来源"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -87,7 +91,8 @@
                                     hc:IconElement.Geometry="{StaticResource AudioGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.PlayAudioCommand, ElementName=TargetDataGrid}"
-                                    Content="播放" />
+                                    Content="播放"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/PictureFileDialog.xaml b/Correlator/Dialog/PictureFileDialog.xaml
index 67e2f9d..5f3f4e7 100644
--- a/Correlator/Dialog/PictureFileDialog.xaml
+++ b/Correlator/Dialog/PictureFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:PictureFileDialogViewModel}"
     mc:Ignorable="d">
 
@@ -36,11 +34,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding PictureFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -53,18 +53,21 @@
                     Width="*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -79,7 +82,8 @@
                                     hc:IconElement.Geometry="{StaticResource EyeOpenGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.ShowPictureCommand, ElementName=TargetDataGrid}"
-                                    Content="查看" />
+                                    Content="查看"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"

diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 711faa4..2f891ca 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -216,14 +216,14 @@
     <Compile Include="Converter\PipeLineValueConverter.cs" />
     <Compile Include="Converter\MuteStateConverter.cs" />
     <Compile Include="Converter\SignalIntensityConverter.cs" />
-    <Compile Include="Converter\SoundParamValueConverter.cs"/>
+      <Compile Include="Converter\SoundParamValueConverter.cs"/>
     <Compile Include="Converter\StepButtonStateConverter.cs" />
-    <Compile Include="Converter\WorkModeConverter.cs"/>
+      <Compile Include="Converter\WorkModeConverter.cs"/>
     <Compile Include="DataService\ApplicationDataServiceImpl.cs" />
     <Compile Include="DataService\AudioServiceImpl.cs" />
-    <Compile Include="DataService\CommandServiceImpl.cs"/>
+      <Compile Include="DataService\CommandServiceImpl.cs"/>
     <Compile Include="DataService\IAudioService.cs" />
-    <Compile Include="DataService\ICommandService.cs"/>
+      <Compile Include="DataService\ICommandService.cs"/>
     <Compile Include="DataService\ISerialPortService.cs" />
     <Compile Include="DataService\SerialPortServiceImpl.cs" />
     <Compile Include="Dialog\AddSoundSpeedDialog.xaml.cs">
@@ -261,13 +261,13 @@
     </Compile>
     <Compile Include="Events\CorrelatorDataEventArgs.cs" />
     <Compile Include="Events\ResponseIndexEventArgs.cs" />
-    <Compile Include="Events\DeviceStatusEventArgs.cs"/>
-    <Compile Include="Model\CommandModel.cs"/>
+      <Compile Include="Events\DeviceStatusEventArgs.cs"/>
+      <Compile Include="Model\CommandModel.cs"/>
     <Compile Include="Model\ResponseModel.cs" />
-    <Compile Include="Model\SampleRateModel.cs"/>
+      <Compile Include="Model\SampleRateModel.cs"/>
     <Compile Include="ViewModels\ApplicationLogViewModel.cs" />
-    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\ApplicationLogView.xaml.cs">
       <DependentUpon>ApplicationLogView.xaml</DependentUpon>
     </Compile>
@@ -323,10 +323,10 @@
     <Compile Include="ViewModels\DetectNoiseDialogViewModel.cs" />
     <Compile Include="ViewModels\EditSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
+      <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
     <Compile Include="ViewModels\NoiseWaveViewViewModel.cs" />
     <Compile Include="ViewModels\NumericKeypadDialogViewModel.cs" />
-    <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
+      <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\SimplyAuditionDialogViewModel.cs" />
     <Compile Include="ViewModels\SoundSpeedDialogViewModel.cs" />
     <Compile Include="Views\BigPictureView.xaml.cs">
@@ -343,15 +343,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\DetectNoiseDialog.xaml" />
-    <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
     <Page Include="Dialog\EditSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ImportHydrophoneDataDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\LoadingDialog.xaml" />
-    <Page Include="Dialog\PictureFileDialog.xaml"/>
-    <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\PictureFileDialog.xaml"/>
+      <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Style\DataGridCellCustomStyle.xaml"/>
+      <Page Include="Style\DataGridRowCustomStyle.xaml">
+          <SubType>Designer</SubType>
+          <Generator>MSBuild:Compile</Generator>
+      </Page>
     <Page Include="Views\ApplicationLogView.xaml" />
     <Page Include="Views\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
diff --git a/Correlator/Dialog/AudioFileDialog.xaml b/Correlator/Dialog/AudioFileDialog.xaml
index 6092aea..af31760 100644
--- a/Correlator/Dialog/AudioFileDialog.xaml
+++ b/Correlator/Dialog/AudioFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:AudioFileDialogViewModel}"
     Loaded="AudioFileView_OnLoaded"
     Unloaded="AudioFileView_OnUnloaded"
@@ -38,11 +36,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding AudioFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -55,24 +55,28 @@
                     Width="1.5*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FileSource}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件来源"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -87,7 +91,8 @@
                                     hc:IconElement.Geometry="{StaticResource AudioGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.PlayAudioCommand, ElementName=TargetDataGrid}"
-                                    Content="播放" />
+                                    Content="播放"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/PictureFileDialog.xaml b/Correlator/Dialog/PictureFileDialog.xaml
index 67e2f9d..5f3f4e7 100644
--- a/Correlator/Dialog/PictureFileDialog.xaml
+++ b/Correlator/Dialog/PictureFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:PictureFileDialogViewModel}"
     mc:Ignorable="d">
 
@@ -36,11 +34,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding PictureFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -53,18 +53,21 @@
                     Width="*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -79,7 +82,8 @@
                                     hc:IconElement.Geometry="{StaticResource EyeOpenGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.ShowPictureCommand, ElementName=TargetDataGrid}"
-                                    Content="查看" />
+                                    Content="查看"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/SoundSampleRateDialog.xaml b/Correlator/Dialog/SoundSampleRateDialog.xaml
index 2ac9542..d0273de 100644
--- a/Correlator/Dialog/SoundSampleRateDialog.xaml
+++ b/Correlator/Dialog/SoundSampleRateDialog.xaml
@@ -9,8 +9,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="500"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSampleRateDialogViewModel}"
     mc:Ignorable="d">
 
@@ -33,11 +33,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding SampleRateCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -49,16 +51,19 @@
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding WorkMode, Converter={StaticResource WorkModeConverterKey}}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="工作模式"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SampleRate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="采样率（Hz）"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UpdateDate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="更新时间"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -70,7 +75,8 @@
                             <Button
                                 HorizontalAlignment="Left"
                                 BorderThickness="0"
-                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}">
+                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}"
+                                Style="{StaticResource ButtonInfo}">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock
                                         Margin="0,0,5,0"

diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 711faa4..2f891ca 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -216,14 +216,14 @@
     <Compile Include="Converter\PipeLineValueConverter.cs" />
     <Compile Include="Converter\MuteStateConverter.cs" />
     <Compile Include="Converter\SignalIntensityConverter.cs" />
-    <Compile Include="Converter\SoundParamValueConverter.cs"/>
+      <Compile Include="Converter\SoundParamValueConverter.cs"/>
     <Compile Include="Converter\StepButtonStateConverter.cs" />
-    <Compile Include="Converter\WorkModeConverter.cs"/>
+      <Compile Include="Converter\WorkModeConverter.cs"/>
     <Compile Include="DataService\ApplicationDataServiceImpl.cs" />
     <Compile Include="DataService\AudioServiceImpl.cs" />
-    <Compile Include="DataService\CommandServiceImpl.cs"/>
+      <Compile Include="DataService\CommandServiceImpl.cs"/>
     <Compile Include="DataService\IAudioService.cs" />
-    <Compile Include="DataService\ICommandService.cs"/>
+      <Compile Include="DataService\ICommandService.cs"/>
     <Compile Include="DataService\ISerialPortService.cs" />
     <Compile Include="DataService\SerialPortServiceImpl.cs" />
     <Compile Include="Dialog\AddSoundSpeedDialog.xaml.cs">
@@ -261,13 +261,13 @@
     </Compile>
     <Compile Include="Events\CorrelatorDataEventArgs.cs" />
     <Compile Include="Events\ResponseIndexEventArgs.cs" />
-    <Compile Include="Events\DeviceStatusEventArgs.cs"/>
-    <Compile Include="Model\CommandModel.cs"/>
+      <Compile Include="Events\DeviceStatusEventArgs.cs"/>
+      <Compile Include="Model\CommandModel.cs"/>
     <Compile Include="Model\ResponseModel.cs" />
-    <Compile Include="Model\SampleRateModel.cs"/>
+      <Compile Include="Model\SampleRateModel.cs"/>
     <Compile Include="ViewModels\ApplicationLogViewModel.cs" />
-    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\ApplicationLogView.xaml.cs">
       <DependentUpon>ApplicationLogView.xaml</DependentUpon>
     </Compile>
@@ -323,10 +323,10 @@
     <Compile Include="ViewModels\DetectNoiseDialogViewModel.cs" />
     <Compile Include="ViewModels\EditSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
+      <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
     <Compile Include="ViewModels\NoiseWaveViewViewModel.cs" />
     <Compile Include="ViewModels\NumericKeypadDialogViewModel.cs" />
-    <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
+      <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\SimplyAuditionDialogViewModel.cs" />
     <Compile Include="ViewModels\SoundSpeedDialogViewModel.cs" />
     <Compile Include="Views\BigPictureView.xaml.cs">
@@ -343,15 +343,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\DetectNoiseDialog.xaml" />
-    <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
     <Page Include="Dialog\EditSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ImportHydrophoneDataDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\LoadingDialog.xaml" />
-    <Page Include="Dialog\PictureFileDialog.xaml"/>
-    <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\PictureFileDialog.xaml"/>
+      <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Style\DataGridCellCustomStyle.xaml"/>
+      <Page Include="Style\DataGridRowCustomStyle.xaml">
+          <SubType>Designer</SubType>
+          <Generator>MSBuild:Compile</Generator>
+      </Page>
     <Page Include="Views\ApplicationLogView.xaml" />
     <Page Include="Views\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
diff --git a/Correlator/Dialog/AudioFileDialog.xaml b/Correlator/Dialog/AudioFileDialog.xaml
index 6092aea..af31760 100644
--- a/Correlator/Dialog/AudioFileDialog.xaml
+++ b/Correlator/Dialog/AudioFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:AudioFileDialogViewModel}"
     Loaded="AudioFileView_OnLoaded"
     Unloaded="AudioFileView_OnUnloaded"
@@ -38,11 +36,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding AudioFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -55,24 +55,28 @@
                     Width="1.5*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FileSource}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件来源"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -87,7 +91,8 @@
                                     hc:IconElement.Geometry="{StaticResource AudioGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.PlayAudioCommand, ElementName=TargetDataGrid}"
-                                    Content="播放" />
+                                    Content="播放"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/PictureFileDialog.xaml b/Correlator/Dialog/PictureFileDialog.xaml
index 67e2f9d..5f3f4e7 100644
--- a/Correlator/Dialog/PictureFileDialog.xaml
+++ b/Correlator/Dialog/PictureFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:PictureFileDialogViewModel}"
     mc:Ignorable="d">
 
@@ -36,11 +34,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding PictureFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -53,18 +53,21 @@
                     Width="*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -79,7 +82,8 @@
                                     hc:IconElement.Geometry="{StaticResource EyeOpenGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.ShowPictureCommand, ElementName=TargetDataGrid}"
-                                    Content="查看" />
+                                    Content="查看"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/SoundSampleRateDialog.xaml b/Correlator/Dialog/SoundSampleRateDialog.xaml
index 2ac9542..d0273de 100644
--- a/Correlator/Dialog/SoundSampleRateDialog.xaml
+++ b/Correlator/Dialog/SoundSampleRateDialog.xaml
@@ -9,8 +9,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="500"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSampleRateDialogViewModel}"
     mc:Ignorable="d">
 
@@ -33,11 +33,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding SampleRateCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -49,16 +51,19 @@
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding WorkMode, Converter={StaticResource WorkModeConverterKey}}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="工作模式"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SampleRate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="采样率（Hz）"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UpdateDate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="更新时间"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -70,7 +75,8 @@
                             <Button
                                 HorizontalAlignment="Left"
                                 BorderThickness="0"
-                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}">
+                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}"
+                                Style="{StaticResource ButtonInfo}">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock
                                         Margin="0,0,5,0"
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 4d4bb9e..ea7a1a4 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -8,8 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="600"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSpeedDialogViewModel}"
     Background="White"
     mc:Ignorable="d">
@@ -29,11 +29,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding VelocityCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -46,6 +48,7 @@
                     Width="*"
                     Binding="{Binding LowDiameter}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="最小直径（mm）"
                     IsReadOnly="True" />
 
@@ -53,6 +56,7 @@
                     Width="*"
                     Binding="{Binding HighDiameter}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="最大直径（mm）"
                     IsReadOnly="True" />
 
@@ -60,6 +64,7 @@
                     Width="*"
                     Binding="{Binding Velocity}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="声速（m/s）"
                     IsReadOnly="True" />
 
@@ -70,7 +75,10 @@
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
-                                <Button BorderThickness="0" Command="{Binding DataContext.DeleteSpeedCommand, ElementName=TargetDataGrid}">
+                                <Button
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.DeleteSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonDanger}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
@@ -85,7 +93,8 @@
                                 <Button
                                     Margin="15,0"
                                     BorderThickness="0"
-                                    Command="{Binding DataContext.AddSpeedCommand, ElementName=TargetDataGrid}">
+                                    Command="{Binding DataContext.AddSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonSuccess}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
@@ -97,7 +106,10 @@
                                     </StackPanel>
                                 </Button>
 
-                                <Button BorderThickness="0" Command="{Binding DataContext.EditSpeedCommand, ElementName=TargetDataGrid}">
+                                <Button
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.EditSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonInfo}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"

diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 711faa4..2f891ca 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -216,14 +216,14 @@
     <Compile Include="Converter\PipeLineValueConverter.cs" />
     <Compile Include="Converter\MuteStateConverter.cs" />
     <Compile Include="Converter\SignalIntensityConverter.cs" />
-    <Compile Include="Converter\SoundParamValueConverter.cs"/>
+      <Compile Include="Converter\SoundParamValueConverter.cs"/>
     <Compile Include="Converter\StepButtonStateConverter.cs" />
-    <Compile Include="Converter\WorkModeConverter.cs"/>
+      <Compile Include="Converter\WorkModeConverter.cs"/>
     <Compile Include="DataService\ApplicationDataServiceImpl.cs" />
     <Compile Include="DataService\AudioServiceImpl.cs" />
-    <Compile Include="DataService\CommandServiceImpl.cs"/>
+      <Compile Include="DataService\CommandServiceImpl.cs"/>
     <Compile Include="DataService\IAudioService.cs" />
-    <Compile Include="DataService\ICommandService.cs"/>
+      <Compile Include="DataService\ICommandService.cs"/>
     <Compile Include="DataService\ISerialPortService.cs" />
     <Compile Include="DataService\SerialPortServiceImpl.cs" />
     <Compile Include="Dialog\AddSoundSpeedDialog.xaml.cs">
@@ -261,13 +261,13 @@
     </Compile>
     <Compile Include="Events\CorrelatorDataEventArgs.cs" />
     <Compile Include="Events\ResponseIndexEventArgs.cs" />
-    <Compile Include="Events\DeviceStatusEventArgs.cs"/>
-    <Compile Include="Model\CommandModel.cs"/>
+      <Compile Include="Events\DeviceStatusEventArgs.cs"/>
+      <Compile Include="Model\CommandModel.cs"/>
     <Compile Include="Model\ResponseModel.cs" />
-    <Compile Include="Model\SampleRateModel.cs"/>
+      <Compile Include="Model\SampleRateModel.cs"/>
     <Compile Include="ViewModels\ApplicationLogViewModel.cs" />
-    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\ApplicationLogView.xaml.cs">
       <DependentUpon>ApplicationLogView.xaml</DependentUpon>
     </Compile>
@@ -323,10 +323,10 @@
     <Compile Include="ViewModels\DetectNoiseDialogViewModel.cs" />
     <Compile Include="ViewModels\EditSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
+      <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
     <Compile Include="ViewModels\NoiseWaveViewViewModel.cs" />
     <Compile Include="ViewModels\NumericKeypadDialogViewModel.cs" />
-    <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
+      <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\SimplyAuditionDialogViewModel.cs" />
     <Compile Include="ViewModels\SoundSpeedDialogViewModel.cs" />
     <Compile Include="Views\BigPictureView.xaml.cs">
@@ -343,15 +343,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\DetectNoiseDialog.xaml" />
-    <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
     <Page Include="Dialog\EditSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ImportHydrophoneDataDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\LoadingDialog.xaml" />
-    <Page Include="Dialog\PictureFileDialog.xaml"/>
-    <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\PictureFileDialog.xaml"/>
+      <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Style\DataGridCellCustomStyle.xaml"/>
+      <Page Include="Style\DataGridRowCustomStyle.xaml">
+          <SubType>Designer</SubType>
+          <Generator>MSBuild:Compile</Generator>
+      </Page>
     <Page Include="Views\ApplicationLogView.xaml" />
     <Page Include="Views\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
diff --git a/Correlator/Dialog/AudioFileDialog.xaml b/Correlator/Dialog/AudioFileDialog.xaml
index 6092aea..af31760 100644
--- a/Correlator/Dialog/AudioFileDialog.xaml
+++ b/Correlator/Dialog/AudioFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:AudioFileDialogViewModel}"
     Loaded="AudioFileView_OnLoaded"
     Unloaded="AudioFileView_OnUnloaded"
@@ -38,11 +36,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding AudioFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -55,24 +55,28 @@
                     Width="1.5*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FileSource}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件来源"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -87,7 +91,8 @@
                                     hc:IconElement.Geometry="{StaticResource AudioGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.PlayAudioCommand, ElementName=TargetDataGrid}"
-                                    Content="播放" />
+                                    Content="播放"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/PictureFileDialog.xaml b/Correlator/Dialog/PictureFileDialog.xaml
index 67e2f9d..5f3f4e7 100644
--- a/Correlator/Dialog/PictureFileDialog.xaml
+++ b/Correlator/Dialog/PictureFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:PictureFileDialogViewModel}"
     mc:Ignorable="d">
 
@@ -36,11 +34,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding PictureFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -53,18 +53,21 @@
                     Width="*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -79,7 +82,8 @@
                                     hc:IconElement.Geometry="{StaticResource EyeOpenGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.ShowPictureCommand, ElementName=TargetDataGrid}"
-                                    Content="查看" />
+                                    Content="查看"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/SoundSampleRateDialog.xaml b/Correlator/Dialog/SoundSampleRateDialog.xaml
index 2ac9542..d0273de 100644
--- a/Correlator/Dialog/SoundSampleRateDialog.xaml
+++ b/Correlator/Dialog/SoundSampleRateDialog.xaml
@@ -9,8 +9,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="500"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSampleRateDialogViewModel}"
     mc:Ignorable="d">
 
@@ -33,11 +33,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding SampleRateCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -49,16 +51,19 @@
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding WorkMode, Converter={StaticResource WorkModeConverterKey}}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="工作模式"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SampleRate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="采样率（Hz）"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UpdateDate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="更新时间"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -70,7 +75,8 @@
                             <Button
                                 HorizontalAlignment="Left"
                                 BorderThickness="0"
-                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}">
+                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}"
+                                Style="{StaticResource ButtonInfo}">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock
                                         Margin="0,0,5,0"
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 4d4bb9e..ea7a1a4 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -8,8 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="600"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSpeedDialogViewModel}"
     Background="White"
     mc:Ignorable="d">
@@ -29,11 +29,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding VelocityCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -46,6 +48,7 @@
                     Width="*"
                     Binding="{Binding LowDiameter}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="最小直径（mm）"
                     IsReadOnly="True" />
 
@@ -53,6 +56,7 @@
                     Width="*"
                     Binding="{Binding HighDiameter}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="最大直径（mm）"
                     IsReadOnly="True" />
 
@@ -60,6 +64,7 @@
                     Width="*"
                     Binding="{Binding Velocity}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="声速（m/s）"
                     IsReadOnly="True" />
 
@@ -70,7 +75,10 @@
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
-                                <Button BorderThickness="0" Command="{Binding DataContext.DeleteSpeedCommand, ElementName=TargetDataGrid}">
+                                <Button
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.DeleteSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonDanger}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
@@ -85,7 +93,8 @@
                                 <Button
                                     Margin="15,0"
                                     BorderThickness="0"
-                                    Command="{Binding DataContext.AddSpeedCommand, ElementName=TargetDataGrid}">
+                                    Command="{Binding DataContext.AddSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonSuccess}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
@@ -97,7 +106,10 @@
                                     </StackPanel>
                                 </Button>
 
-                                <Button BorderThickness="0" Command="{Binding DataContext.EditSpeedCommand, ElementName=TargetDataGrid}">
+                                <Button
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.EditSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonInfo}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
diff --git a/Correlator/Properties/AssemblyInfo.cs b/Correlator/Properties/AssemblyInfo.cs
index cbf0513..76165bf 100644
--- a/Correlator/Properties/AssemblyInfo.cs
+++ b/Correlator/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.5")]
-[assembly: AssemblyFileVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyFileVersion("1.0.0.6")]
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file

diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 711faa4..2f891ca 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -216,14 +216,14 @@
     <Compile Include="Converter\PipeLineValueConverter.cs" />
     <Compile Include="Converter\MuteStateConverter.cs" />
     <Compile Include="Converter\SignalIntensityConverter.cs" />
-    <Compile Include="Converter\SoundParamValueConverter.cs"/>
+      <Compile Include="Converter\SoundParamValueConverter.cs"/>
     <Compile Include="Converter\StepButtonStateConverter.cs" />
-    <Compile Include="Converter\WorkModeConverter.cs"/>
+      <Compile Include="Converter\WorkModeConverter.cs"/>
     <Compile Include="DataService\ApplicationDataServiceImpl.cs" />
     <Compile Include="DataService\AudioServiceImpl.cs" />
-    <Compile Include="DataService\CommandServiceImpl.cs"/>
+      <Compile Include="DataService\CommandServiceImpl.cs"/>
     <Compile Include="DataService\IAudioService.cs" />
-    <Compile Include="DataService\ICommandService.cs"/>
+      <Compile Include="DataService\ICommandService.cs"/>
     <Compile Include="DataService\ISerialPortService.cs" />
     <Compile Include="DataService\SerialPortServiceImpl.cs" />
     <Compile Include="Dialog\AddSoundSpeedDialog.xaml.cs">
@@ -261,13 +261,13 @@
     </Compile>
     <Compile Include="Events\CorrelatorDataEventArgs.cs" />
     <Compile Include="Events\ResponseIndexEventArgs.cs" />
-    <Compile Include="Events\DeviceStatusEventArgs.cs"/>
-    <Compile Include="Model\CommandModel.cs"/>
+      <Compile Include="Events\DeviceStatusEventArgs.cs"/>
+      <Compile Include="Model\CommandModel.cs"/>
     <Compile Include="Model\ResponseModel.cs" />
-    <Compile Include="Model\SampleRateModel.cs"/>
+      <Compile Include="Model\SampleRateModel.cs"/>
     <Compile Include="ViewModels\ApplicationLogViewModel.cs" />
-    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\ApplicationLogView.xaml.cs">
       <DependentUpon>ApplicationLogView.xaml</DependentUpon>
     </Compile>
@@ -323,10 +323,10 @@
     <Compile Include="ViewModels\DetectNoiseDialogViewModel.cs" />
     <Compile Include="ViewModels\EditSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
+      <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
     <Compile Include="ViewModels\NoiseWaveViewViewModel.cs" />
     <Compile Include="ViewModels\NumericKeypadDialogViewModel.cs" />
-    <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
+      <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\SimplyAuditionDialogViewModel.cs" />
     <Compile Include="ViewModels\SoundSpeedDialogViewModel.cs" />
     <Compile Include="Views\BigPictureView.xaml.cs">
@@ -343,15 +343,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\DetectNoiseDialog.xaml" />
-    <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
     <Page Include="Dialog\EditSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ImportHydrophoneDataDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\LoadingDialog.xaml" />
-    <Page Include="Dialog\PictureFileDialog.xaml"/>
-    <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\PictureFileDialog.xaml"/>
+      <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Style\DataGridCellCustomStyle.xaml"/>
+      <Page Include="Style\DataGridRowCustomStyle.xaml">
+          <SubType>Designer</SubType>
+          <Generator>MSBuild:Compile</Generator>
+      </Page>
     <Page Include="Views\ApplicationLogView.xaml" />
     <Page Include="Views\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
diff --git a/Correlator/Dialog/AudioFileDialog.xaml b/Correlator/Dialog/AudioFileDialog.xaml
index 6092aea..af31760 100644
--- a/Correlator/Dialog/AudioFileDialog.xaml
+++ b/Correlator/Dialog/AudioFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:AudioFileDialogViewModel}"
     Loaded="AudioFileView_OnLoaded"
     Unloaded="AudioFileView_OnUnloaded"
@@ -38,11 +36,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding AudioFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -55,24 +55,28 @@
                     Width="1.5*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FileSource}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件来源"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -87,7 +91,8 @@
                                     hc:IconElement.Geometry="{StaticResource AudioGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.PlayAudioCommand, ElementName=TargetDataGrid}"
-                                    Content="播放" />
+                                    Content="播放"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/PictureFileDialog.xaml b/Correlator/Dialog/PictureFileDialog.xaml
index 67e2f9d..5f3f4e7 100644
--- a/Correlator/Dialog/PictureFileDialog.xaml
+++ b/Correlator/Dialog/PictureFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:PictureFileDialogViewModel}"
     mc:Ignorable="d">
 
@@ -36,11 +34,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding PictureFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -53,18 +53,21 @@
                     Width="*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -79,7 +82,8 @@
                                     hc:IconElement.Geometry="{StaticResource EyeOpenGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.ShowPictureCommand, ElementName=TargetDataGrid}"
-                                    Content="查看" />
+                                    Content="查看"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/SoundSampleRateDialog.xaml b/Correlator/Dialog/SoundSampleRateDialog.xaml
index 2ac9542..d0273de 100644
--- a/Correlator/Dialog/SoundSampleRateDialog.xaml
+++ b/Correlator/Dialog/SoundSampleRateDialog.xaml
@@ -9,8 +9,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="500"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSampleRateDialogViewModel}"
     mc:Ignorable="d">
 
@@ -33,11 +33,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding SampleRateCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -49,16 +51,19 @@
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding WorkMode, Converter={StaticResource WorkModeConverterKey}}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="工作模式"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SampleRate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="采样率（Hz）"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UpdateDate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="更新时间"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -70,7 +75,8 @@
                             <Button
                                 HorizontalAlignment="Left"
                                 BorderThickness="0"
-                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}">
+                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}"
+                                Style="{StaticResource ButtonInfo}">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock
                                         Margin="0,0,5,0"
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 4d4bb9e..ea7a1a4 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -8,8 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="600"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSpeedDialogViewModel}"
     Background="White"
     mc:Ignorable="d">
@@ -29,11 +29,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding VelocityCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -46,6 +48,7 @@
                     Width="*"
                     Binding="{Binding LowDiameter}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="最小直径（mm）"
                     IsReadOnly="True" />
 
@@ -53,6 +56,7 @@
                     Width="*"
                     Binding="{Binding HighDiameter}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="最大直径（mm）"
                     IsReadOnly="True" />
 
@@ -60,6 +64,7 @@
                     Width="*"
                     Binding="{Binding Velocity}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="声速（m/s）"
                     IsReadOnly="True" />
 
@@ -70,7 +75,10 @@
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
-                                <Button BorderThickness="0" Command="{Binding DataContext.DeleteSpeedCommand, ElementName=TargetDataGrid}">
+                                <Button
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.DeleteSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonDanger}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
@@ -85,7 +93,8 @@
                                 <Button
                                     Margin="15,0"
                                     BorderThickness="0"
-                                    Command="{Binding DataContext.AddSpeedCommand, ElementName=TargetDataGrid}">
+                                    Command="{Binding DataContext.AddSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonSuccess}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
@@ -97,7 +106,10 @@
                                     </StackPanel>
                                 </Button>
 
-                                <Button BorderThickness="0" Command="{Binding DataContext.EditSpeedCommand, ElementName=TargetDataGrid}">
+                                <Button
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.EditSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonInfo}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
diff --git a/Correlator/Properties/AssemblyInfo.cs b/Correlator/Properties/AssemblyInfo.cs
index cbf0513..76165bf 100644
--- a/Correlator/Properties/AssemblyInfo.cs
+++ b/Correlator/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.5")]
-[assembly: AssemblyFileVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyFileVersion("1.0.0.6")]
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file
diff --git a/Correlator/Style/DataGridCellCustomStyle.xaml b/Correlator/Style/DataGridCellCustomStyle.xaml
new file mode 100644
index 0000000..72027cd
--- /dev/null
+++ b/Correlator/Style/DataGridCellCustomStyle.xaml
@@ -0,0 +1,97 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:hc="https://handyorg.github.io/handycontrol">
+    <Style x:Key="DataGridCellCustomStyleKey" TargetType="DataGridCell">
+        <Setter Property="FocusVisualStyle">
+            <Setter.Value>
+                <Style>
+                    <Setter Property="Control.Template">
+                        <Setter.Value>
+                            <ControlTemplate>
+                                <Rectangle
+                                    Margin="2"
+                                    Opacity=".6"
+                                    RadiusX="4"
+                                    RadiusY="4"
+                                    SnapsToDevicePixels="true"
+                                    Stroke="{DynamicResource SecondaryBorderBrush}"
+                                    StrokeDashArray="1 1"
+                                    StrokeThickness="2" />
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridCell">
+                    <Border Background="Transparent">
+                        <Border
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                            SnapsToDevicePixels="True">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                    <Condition Binding="{Binding SelectionUnit, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGrid}}" Value="Cell" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+                <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="False" />
+                    <Condition Binding="{Binding SelectionUnit, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGrid}}" Value="CellOrRowHeader" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+                <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="True" />
+                    <Condition Binding="{Binding SelectionUnit, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGrid}}" Value="CellOrRowHeader" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                    <Condition Binding="{Binding SelectionUnit, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGrid}}" Value="FullRow" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+            </MultiDataTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsSelected" Value="true" />
+                    <Condition Property="Selector.IsSelectionActive" Value="false" />
+                </MultiTrigger.Conditions>
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+            </MultiTrigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file

diff --git a/Correlator/App.xaml b/Correlator/App.xaml
index ec7965c..c79969a 100644
--- a/Correlator/App.xaml
+++ b/Correlator/App.xaml
@@ -22,6 +22,8 @@
                 <ResourceDictionary Source="Style/MainMenuButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/RadioButtonStyle.xaml" />
                 <ResourceDictionary Source="Style/FunctionButtonStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridRowCustomStyle.xaml" />
+                <ResourceDictionary Source="Style/DataGridCellCustomStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 711faa4..2f891ca 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -216,14 +216,14 @@
     <Compile Include="Converter\PipeLineValueConverter.cs" />
     <Compile Include="Converter\MuteStateConverter.cs" />
     <Compile Include="Converter\SignalIntensityConverter.cs" />
-    <Compile Include="Converter\SoundParamValueConverter.cs"/>
+      <Compile Include="Converter\SoundParamValueConverter.cs"/>
     <Compile Include="Converter\StepButtonStateConverter.cs" />
-    <Compile Include="Converter\WorkModeConverter.cs"/>
+      <Compile Include="Converter\WorkModeConverter.cs"/>
     <Compile Include="DataService\ApplicationDataServiceImpl.cs" />
     <Compile Include="DataService\AudioServiceImpl.cs" />
-    <Compile Include="DataService\CommandServiceImpl.cs"/>
+      <Compile Include="DataService\CommandServiceImpl.cs"/>
     <Compile Include="DataService\IAudioService.cs" />
-    <Compile Include="DataService\ICommandService.cs"/>
+      <Compile Include="DataService\ICommandService.cs"/>
     <Compile Include="DataService\ISerialPortService.cs" />
     <Compile Include="DataService\SerialPortServiceImpl.cs" />
     <Compile Include="Dialog\AddSoundSpeedDialog.xaml.cs">
@@ -261,13 +261,13 @@
     </Compile>
     <Compile Include="Events\CorrelatorDataEventArgs.cs" />
     <Compile Include="Events\ResponseIndexEventArgs.cs" />
-    <Compile Include="Events\DeviceStatusEventArgs.cs"/>
-    <Compile Include="Model\CommandModel.cs"/>
+      <Compile Include="Events\DeviceStatusEventArgs.cs"/>
+      <Compile Include="Model\CommandModel.cs"/>
     <Compile Include="Model\ResponseModel.cs" />
-    <Compile Include="Model\SampleRateModel.cs"/>
+      <Compile Include="Model\SampleRateModel.cs"/>
     <Compile Include="ViewModels\ApplicationLogViewModel.cs" />
-    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\ApplicationLogView.xaml.cs">
       <DependentUpon>ApplicationLogView.xaml</DependentUpon>
     </Compile>
@@ -323,10 +323,10 @@
     <Compile Include="ViewModels\DetectNoiseDialogViewModel.cs" />
     <Compile Include="ViewModels\EditSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
+      <Compile Include="ViewModels\ImportHydrophoneDataDialogViewModel.cs"/>
     <Compile Include="ViewModels\NoiseWaveViewViewModel.cs" />
     <Compile Include="ViewModels\NumericKeypadDialogViewModel.cs" />
-    <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
+      <Compile Include="ViewModels\PictureFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\SimplyAuditionDialogViewModel.cs" />
     <Compile Include="ViewModels\SoundSpeedDialogViewModel.cs" />
     <Compile Include="Views\BigPictureView.xaml.cs">
@@ -343,15 +343,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\DetectNoiseDialog.xaml" />
-    <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\EditSoundSampleRateDialog.xaml"/>
     <Page Include="Dialog\EditSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ImportHydrophoneDataDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Dialog\LoadingDialog.xaml" />
-    <Page Include="Dialog\PictureFileDialog.xaml"/>
-    <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Dialog\PictureFileDialog.xaml"/>
+      <Page Include="Dialog\SoundSampleRateDialog.xaml"/>
+      <Page Include="Style\DataGridCellCustomStyle.xaml"/>
+      <Page Include="Style\DataGridRowCustomStyle.xaml">
+          <SubType>Designer</SubType>
+          <Generator>MSBuild:Compile</Generator>
+      </Page>
     <Page Include="Views\ApplicationLogView.xaml" />
     <Page Include="Views\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
diff --git a/Correlator/Dialog/AudioFileDialog.xaml b/Correlator/Dialog/AudioFileDialog.xaml
index 6092aea..af31760 100644
--- a/Correlator/Dialog/AudioFileDialog.xaml
+++ b/Correlator/Dialog/AudioFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:AudioFileDialogViewModel}"
     Loaded="AudioFileView_OnLoaded"
     Unloaded="AudioFileView_OnUnloaded"
@@ -38,11 +36,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding AudioFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -55,24 +55,28 @@
                     Width="1.5*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FileSource}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件来源"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -87,7 +91,8 @@
                                     hc:IconElement.Geometry="{StaticResource AudioGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.PlayAudioCommand, ElementName=TargetDataGrid}"
-                                    Content="播放" />
+                                    Content="播放"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/PictureFileDialog.xaml b/Correlator/Dialog/PictureFileDialog.xaml
index 67e2f9d..5f3f4e7 100644
--- a/Correlator/Dialog/PictureFileDialog.xaml
+++ b/Correlator/Dialog/PictureFileDialog.xaml
@@ -8,10 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    MinWidth="1200"
-    MinHeight="635"
-    MaxWidth="1200"
-    MaxHeight="635"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:PictureFileDialogViewModel}"
     mc:Ignorable="d">
 
@@ -36,11 +34,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding PictureFiles}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -53,18 +53,21 @@
                     Width="*"
                     Binding="{Binding FileName}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="名称"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding CreationTime}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="生成时间"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="200"
                     Binding="{Binding FileSize}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="文件大小"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -79,7 +82,8 @@
                                     hc:IconElement.Geometry="{StaticResource EyeOpenGeometry}"
                                     BorderThickness="0"
                                     Command="{Binding DataContext.ShowPictureCommand, ElementName=TargetDataGrid}"
-                                    Content="查看" />
+                                    Content="查看"
+                                    Style="{StaticResource ButtonInfo}" />
 
                                 <Button
                                     Margin="7,0,0,0"
diff --git a/Correlator/Dialog/SoundSampleRateDialog.xaml b/Correlator/Dialog/SoundSampleRateDialog.xaml
index 2ac9542..d0273de 100644
--- a/Correlator/Dialog/SoundSampleRateDialog.xaml
+++ b/Correlator/Dialog/SoundSampleRateDialog.xaml
@@ -9,8 +9,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="500"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSampleRateDialogViewModel}"
     mc:Ignorable="d">
 
@@ -33,11 +33,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding SampleRateCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -49,16 +51,19 @@
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding WorkMode, Converter={StaticResource WorkModeConverterKey}}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="工作模式"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SampleRate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="采样率（Hz）"
                     IsReadOnly="True" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UpdateDate}"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="更新时间"
                     IsReadOnly="True" />
                 <DataGridTemplateColumn
@@ -70,7 +75,8 @@
                             <Button
                                 HorizontalAlignment="Left"
                                 BorderThickness="0"
-                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}">
+                                Command="{Binding DataContext.EditSampleRateCommand, ElementName=TargetDataGrid}"
+                                Style="{StaticResource ButtonInfo}">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock
                                         Margin="0,0,5,0"
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 4d4bb9e..ea7a1a4 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -8,8 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
-    Width="900"
-    Height="600"
+    Width="1200"
+    Height="635"
     d:DataContext="{d:DesignInstance Type=vm:SoundSpeedDialogViewModel}"
     Background="White"
     mc:Ignorable="d">
@@ -29,11 +29,13 @@
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
             AutoGenerateColumns="False"
             CanUserSortColumns="False"
+            CellStyle="{StaticResource DataGridCellCustomStyleKey}"
             ColumnHeaderHeight="60"
             FontSize="18"
             HeadersVisibility="All"
             ItemsSource="{Binding VelocityCollection}"
-            RowHeight="60">
+            RowHeight="60"
+            RowStyle="{StaticResource DataGridRowCustomStyleKey}">
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -46,6 +48,7 @@
                     Width="*"
                     Binding="{Binding LowDiameter}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="最小直径（mm）"
                     IsReadOnly="True" />
 
@@ -53,6 +56,7 @@
                     Width="*"
                     Binding="{Binding HighDiameter}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="最大直径（mm）"
                     IsReadOnly="True" />
 
@@ -60,6 +64,7 @@
                     Width="*"
                     Binding="{Binding Velocity}"
                     CanUserResize="False"
+                    Foreground="{StaticResource PrimaryTextBrush}"
                     Header="声速（m/s）"
                     IsReadOnly="True" />
 
@@ -70,7 +75,10 @@
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
-                                <Button BorderThickness="0" Command="{Binding DataContext.DeleteSpeedCommand, ElementName=TargetDataGrid}">
+                                <Button
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.DeleteSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonDanger}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
@@ -85,7 +93,8 @@
                                 <Button
                                     Margin="15,0"
                                     BorderThickness="0"
-                                    Command="{Binding DataContext.AddSpeedCommand, ElementName=TargetDataGrid}">
+                                    Command="{Binding DataContext.AddSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonSuccess}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
@@ -97,7 +106,10 @@
                                     </StackPanel>
                                 </Button>
 
-                                <Button BorderThickness="0" Command="{Binding DataContext.EditSpeedCommand, ElementName=TargetDataGrid}">
+                                <Button
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.EditSpeedCommand, ElementName=TargetDataGrid}"
+                                    Style="{StaticResource ButtonInfo}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock
                                             Margin="0,0,5,0"
diff --git a/Correlator/Properties/AssemblyInfo.cs b/Correlator/Properties/AssemblyInfo.cs
index cbf0513..76165bf 100644
--- a/Correlator/Properties/AssemblyInfo.cs
+++ b/Correlator/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.5")]
-[assembly: AssemblyFileVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyFileVersion("1.0.0.6")]
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file
diff --git a/Correlator/Style/DataGridCellCustomStyle.xaml b/Correlator/Style/DataGridCellCustomStyle.xaml
new file mode 100644
index 0000000..72027cd
--- /dev/null
+++ b/Correlator/Style/DataGridCellCustomStyle.xaml
@@ -0,0 +1,97 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:hc="https://handyorg.github.io/handycontrol">
+    <Style x:Key="DataGridCellCustomStyleKey" TargetType="DataGridCell">
+        <Setter Property="FocusVisualStyle">
+            <Setter.Value>
+                <Style>
+                    <Setter Property="Control.Template">
+                        <Setter.Value>
+                            <ControlTemplate>
+                                <Rectangle
+                                    Margin="2"
+                                    Opacity=".6"
+                                    RadiusX="4"
+                                    RadiusY="4"
+                                    SnapsToDevicePixels="true"
+                                    Stroke="{DynamicResource SecondaryBorderBrush}"
+                                    StrokeDashArray="1 1"
+                                    StrokeThickness="2" />
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridCell">
+                    <Border Background="Transparent">
+                        <Border
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                            SnapsToDevicePixels="True">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                    <Condition Binding="{Binding SelectionUnit, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGrid}}" Value="Cell" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+                <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="False" />
+                    <Condition Binding="{Binding SelectionUnit, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGrid}}" Value="CellOrRowHeader" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+                <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="True" />
+                    <Condition Binding="{Binding SelectionUnit, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGrid}}" Value="CellOrRowHeader" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                    <Condition Binding="{Binding SelectionUnit, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGrid}}" Value="FullRow" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+            </MultiDataTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsSelected" Value="true" />
+                    <Condition Property="Selector.IsSelectionActive" Value="false" />
+                </MultiTrigger.Conditions>
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+            </MultiTrigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Correlator/Style/DataGridRowCustomStyle.xaml b/Correlator/Style/DataGridRowCustomStyle.xaml
new file mode 100644
index 0000000..367f1f8
--- /dev/null
+++ b/Correlator/Style/DataGridRowCustomStyle.xaml
@@ -0,0 +1,55 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="DataGridRowCustomStyleKey" TargetType="DataGridRow">
+        <Setter Property="SnapsToDevicePixels" Value="true" />
+        <Setter Property="Margin" Value="0,0,0,4" />
+        <Setter Property="Padding" Value="0,6" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridRow">
+                    <SelectiveScrollingGrid>
+                        <SelectiveScrollingGrid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </SelectiveScrollingGrid.ColumnDefinitions>
+                        <SelectiveScrollingGrid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </SelectiveScrollingGrid.RowDefinitions>
+                        <Border
+                            x:Name="DGR_Border"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4"
+                            SnapsToDevicePixels="True" />
+                        <DataGridCellsPresenter
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            VerticalContentAlignment="Center"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <DataGridDetailsPresenter
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"
+                            Visibility="{TemplateBinding DetailsVisibility}" />
+                        <DataGridRowHeader
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
+                            Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+                    </SelectiveScrollingGrid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file