diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index d0b724af..0e7cc43b 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -85,13 +85,13 @@
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
-    <ManifestCertificateThumbprint>C5FD306818D481FBECE3B2E74D7A912F515191E0</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>6710065D6908FA30B5E5EDA4479BCAB35E71FB06</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>ENI2_7_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>ENI2_8_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 64|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -327,15 +327,15 @@
     <Compile Include="Controls\MaerskOverviewControl.xaml.cs">
       <DependentUpon>MaerskOverviewControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ValueMappingsControl.xaml.cs">
-      <DependentUpon>ValueMappingsControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\HazardMaterialControl.xaml.cs">
-      <DependentUpon>HazardMaterialControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\WASExemptionsControl.xaml.cs">
-      <DependentUpon>WASExemptionsControl.xaml</DependentUpon>
-    </Compile>
+    <Compile Include="Controls\ValueMappingsControl.xaml.cs">
+      <DependentUpon>ValueMappingsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\HazardMaterialControl.xaml.cs">
+      <DependentUpon>HazardMaterialControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\WASExemptionsControl.xaml.cs">
+      <DependentUpon>WASExemptionsControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="EditControls\ChangePasswordDialog.xaml.cs">
       <DependentUpon>ChangePasswordDialog.xaml</DependentUpon>
     </Compile>
@@ -651,18 +651,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\ValueMappingsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\HazardMaterialControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\WASExemptionsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
+    <Page Include="Controls\ValueMappingsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\HazardMaterialControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\WASExemptionsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ControlTemplates.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1000,6 +1000,7 @@
     <None Include="ENI2_5_TemporaryKey.pfx" />
     <None Include="ENI2_6_TemporaryKey.pfx" />
     <None Include="ENI2_7_TemporaryKey.pfx" />
+    <None Include="ENI2_8_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="Service References\LockingServiceReference\ENI2.LockingServiceReference.CoreLock.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
@@ -1240,7 +1241,7 @@
     <SignToolPath Condition="'$(SignToolPath)' == '' And '$(SignToolPathBase)' != ''">$(SignToolPathBase)$(Platform)\</SignToolPath>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>"$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\ENI2_7_TemporaryKey.pfx /p FgrMFUWsTVGQeb6L6i0e /fd SHA256 $(TargetPath)</PostBuildEvent>
+    <PostBuildEvent>"$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\ENI2_8_TemporaryKey.pfx /p FgrMFUWsTVGQeb6L6i0e /fd SHA256 $(TargetPath)</PostBuildEvent>
   </PropertyGroup>
   <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -1258,4 +1259,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/ENI2/ENI2_8_TemporaryKey.pfx b/ENI2/ENI2_8_TemporaryKey.pfx
new file mode 100644
index 00000000..4585139c
Binary files /dev/null and b/ENI2/ENI2_8_TemporaryKey.pfx differ