diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 2b94b22..81ab608 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -128,9 +128,6 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="playWaveNamespace">
-      <HintPath>C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll</HintPath>
-    </Reference>
     <Reference Include="Prism, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
       <HintPath>..\packages\Prism.Core.8.1.97\lib\net47\Prism.dll</HintPath>
     </Reference>
@@ -216,14 +213,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">
@@ -232,9 +229,9 @@
     <Compile Include="Dialog\ApplicationInfoDialog.xaml.cs">
       <DependentUpon>ApplicationInfoDialog.xaml</DependentUpon>
     </Compile>
-      <Compile Include="Dialog\AudioFileDialog.xaml.cs">
-          <DependentUpon>AudioFileDialog.xaml</DependentUpon>
-      </Compile>
+    <Compile Include="Dialog\AudioFileDialog.xaml.cs">
+      <DependentUpon>AudioFileDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Dialog\CheckResponseDialog.xaml.cs">
       <DependentUpon>CheckResponseDialog.xaml</DependentUpon>
     </Compile>
@@ -261,12 +258,12 @@
     </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="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+    <Compile Include="Model\SampleRateModel.cs"/>
+    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\NoiseWaveView.xaml.cs">
       <DependentUpon>NoiseWaveView.xaml</DependentUpon>
     </Compile>
@@ -313,16 +310,16 @@
     <Compile Include="Util\SystemConfig.cs" />
     <Compile Include="ViewModels\AddSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\ApplicationInfoDialogViewModel.cs" />
-      <Compile Include="ViewModels\AudioFileDialogViewModel.cs"/>
+    <Compile Include="ViewModels\AudioFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\BigPictureViewModel.cs" />
     <Compile Include="ViewModels\CheckResponseDialogViewModel.cs" />
     <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">
@@ -333,26 +330,26 @@
     </Compile>
     <Page Include="Dialog\AddSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ApplicationInfoDialog.xaml" />
-      <Page Include="Dialog\AudioFileDialog.xaml"/>
+    <Page Include="Dialog\AudioFileDialog.xaml"/>
     <Page Include="Dialog\CheckResponseDialog.xaml">
       <SubType>Designer</SubType>
       <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="Style\DataGridCellCustomStyle.xaml"/>
-      <Page Include="Style\DataGridRowCustomStyle.xaml">
-          <SubType>Designer</SubType>
-          <Generator>MSBuild:Compile</Generator>
-      </Page>
+    <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\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
     </Page>

diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 2b94b22..81ab608 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -128,9 +128,6 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="playWaveNamespace">
-      <HintPath>C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll</HintPath>
-    </Reference>
     <Reference Include="Prism, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
       <HintPath>..\packages\Prism.Core.8.1.97\lib\net47\Prism.dll</HintPath>
     </Reference>
@@ -216,14 +213,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">
@@ -232,9 +229,9 @@
     <Compile Include="Dialog\ApplicationInfoDialog.xaml.cs">
       <DependentUpon>ApplicationInfoDialog.xaml</DependentUpon>
     </Compile>
-      <Compile Include="Dialog\AudioFileDialog.xaml.cs">
-          <DependentUpon>AudioFileDialog.xaml</DependentUpon>
-      </Compile>
+    <Compile Include="Dialog\AudioFileDialog.xaml.cs">
+      <DependentUpon>AudioFileDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Dialog\CheckResponseDialog.xaml.cs">
       <DependentUpon>CheckResponseDialog.xaml</DependentUpon>
     </Compile>
@@ -261,12 +258,12 @@
     </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="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
-      <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
+    <Compile Include="Model\SampleRateModel.cs"/>
+    <Compile Include="ViewModels\EditSoundSampleRateDialogViewModel.cs"/>
+    <Compile Include="ViewModels\SoundSampleRateDialogViewModel.cs"/>
     <Compile Include="Views\NoiseWaveView.xaml.cs">
       <DependentUpon>NoiseWaveView.xaml</DependentUpon>
     </Compile>
@@ -313,16 +310,16 @@
     <Compile Include="Util\SystemConfig.cs" />
     <Compile Include="ViewModels\AddSoundSpeedDialogViewModel.cs" />
     <Compile Include="ViewModels\ApplicationInfoDialogViewModel.cs" />
-      <Compile Include="ViewModels\AudioFileDialogViewModel.cs"/>
+    <Compile Include="ViewModels\AudioFileDialogViewModel.cs"/>
     <Compile Include="ViewModels\BigPictureViewModel.cs" />
     <Compile Include="ViewModels\CheckResponseDialogViewModel.cs" />
     <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">
@@ -333,26 +330,26 @@
     </Compile>
     <Page Include="Dialog\AddSoundSpeedDialog.xaml" />
     <Page Include="Dialog\ApplicationInfoDialog.xaml" />
-      <Page Include="Dialog\AudioFileDialog.xaml"/>
+    <Page Include="Dialog\AudioFileDialog.xaml"/>
     <Page Include="Dialog\CheckResponseDialog.xaml">
       <SubType>Designer</SubType>
       <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="Style\DataGridCellCustomStyle.xaml"/>
-      <Page Include="Style\DataGridRowCustomStyle.xaml">
-          <SubType>Designer</SubType>
-          <Generator>MSBuild:Compile</Generator>
-      </Page>
+    <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\NoiseWaveView.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git a/Correlator/DefaultMaterialConfig.db b/Correlator/DefaultMaterialConfig.db
deleted file mode 100644
index 01b3dfd..0000000
--- a/Correlator/DefaultMaterialConfig.db
+++ /dev/null
Binary files differ