diff --git a/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj b/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
index f5130f9a74..3e7dd37330 100644
--- a/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
+++ b/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
@@ -204,7 +204,6 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="Key.snk" />
-    <Content Include="EFCorePowerToolsPackage.jp.vsct" />
     <Content Include="PowerToolsReadMe.md">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -269,98 +268,103 @@
   <ItemGroup>
     <EmbeddedResource Include="Locales\AboutLocale.cs.resx" />
     <EmbeddedResource Include="Locales\AboutLocale.de.resx" />
+    <EmbeddedResource Include="Locales\AboutLocale.en.resx" />
     <EmbeddedResource Include="Locales\AboutLocale.es.resx" />
+    <EmbeddedResource Include="Locales\AboutLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\AboutLocale.it.resx" />
     <EmbeddedResource Include="Locales\AboutLocale.jp.resx" />
-    <EmbeddedResource Include="Locales\AboutLocale.fr.resx" />   
     <EmbeddedResource Include="Locales\AboutLocale.pt-BR.resx" />
     <EmbeddedResource Include="Locales\AboutLocale.ru.resx" />
     <EmbeddedResource Include="Locales\AboutLocale.tr.resx" />
+    <EmbeddedResource Include="Locales\AboutLocale.zh-Hans.resx" />
+    <EmbeddedResource Include="Locales\AboutLocale.zh-Hant.resx" />
     <EmbeddedResource Include="Locales\AboutLocale.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>AboutLocale.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Locales\AboutLocale.en.resx" />
-    <EmbeddedResource Include="Locales\AboutLocale.it.resx" />
-    <EmbeddedResource Include="Locales\AboutLocale.zh-Hans.resx" />
-    <EmbeddedResource Include="Locales\AboutLocale.zh-Hant.resx" />
+    
     <EmbeddedResource Include="Locales\CompareLocale.cs.resx" />
     <EmbeddedResource Include="Locales\CompareLocale.de.resx" />
+    <EmbeddedResource Include="Locales\CompareLocale.en.resx" />
     <EmbeddedResource Include="Locales\CompareLocale.es.resx" />
+    <EmbeddedResource Include="Locales\CompareLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\CompareLocale.it.resx" />
     <EmbeddedResource Include="Locales\CompareLocale.jp.resx" />
     <EmbeddedResource Include="Locales\CompareLocale.pt-BR.resx" />
     <EmbeddedResource Include="Locales\CompareLocale.ru.resx" />
     <EmbeddedResource Include="Locales\CompareLocale.tr.resx" />
-    <EmbeddedResource Include="Locales\CompareLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\CompareLocale.zh-Hans.resx" />
+    <EmbeddedResource Include="Locales\CompareLocale.zh-Hant.resx" />
     <EmbeddedResource Include="Locales\CompareLocale.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>CompareLocale.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Locales\CompareLocale.en.resx" />
-    <EmbeddedResource Include="Locales\CompareLocale.it.resx" />
-    <EmbeddedResource Include="Locales\CompareLocale.zh-Hans.resx" />
-    <EmbeddedResource Include="Locales\CompareLocale.zh-Hant.resx" />
+    
     <EmbeddedResource Include="Locales\DgmlLocale.cs.resx" />
     <EmbeddedResource Include="Locales\DgmlLocale.de.resx" />
+    <EmbeddedResource Include="Locales\DgmlLocale.en.resx" />
     <EmbeddedResource Include="Locales\DgmlLocale.es.resx" />
+    <EmbeddedResource Include="Locales\DgmlLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\DgmlLocale.it.resx" />
     <EmbeddedResource Include="Locales\DgmlLocale.jp.resx" />
     <EmbeddedResource Include="Locales\DgmlLocale.pt-BR.resx" />
     <EmbeddedResource Include="Locales\DgmlLocale.ru.resx" />
     <EmbeddedResource Include="Locales\DgmlLocale.tr.resx" />
-    <EmbeddedResource Include="Locales\DgmlLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\DgmlLocale.zh-Hans.resx" />
+    <EmbeddedResource Include="Locales\DgmlLocale.zh-Hant.resx" />
     <EmbeddedResource Include="Locales\DgmlLocale.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>DgmlLocale.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="Locales\DgmlLocale.it.resx" />
-    <EmbeddedResource Include="Locales\DgmlLocale.en.resx" />
-    <EmbeddedResource Include="Locales\DgmlLocale.zh-Hans.resx" />
-    <EmbeddedResource Include="Locales\DgmlLocale.zh-Hant.resx" />
+    
     <EmbeddedResource Include="Locales\MigrationsLocale.cs.resx" />
     <EmbeddedResource Include="Locales\MigrationsLocale.de.resx" />
+    <EmbeddedResource Include="Locales\MigrationsLocale.en.resx" />
     <EmbeddedResource Include="Locales\MigrationsLocale.es.resx" />
+    <EmbeddedResource Include="Locales\MigrationsLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\MigrationsLocale.it.resx" />
     <EmbeddedResource Include="Locales\MigrationsLocale.jp.resx" />
     <EmbeddedResource Include="Locales\MigrationsLocale.pt-BR.resx" />
     <EmbeddedResource Include="Locales\MigrationsLocale.ru.resx" />
     <EmbeddedResource Include="Locales\MigrationsLocale.tr.resx" />
-    <EmbeddedResource Include="Locales\MigrationsLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\MigrationsLocale.zh-Hans.resx" />
+    <EmbeddedResource Include="Locales\MigrationsLocale.zh-Hant.resx" />
     <EmbeddedResource Include="Locales\MigrationsLocale.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>MigrationsLocale.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Locales\MigrationsLocale.en.resx" />
-    <EmbeddedResource Include="Locales\MigrationsLocale.it.resx" />
-    <EmbeddedResource Include="Locales\MigrationsLocale.zh-Hans.resx" />
-    <EmbeddedResource Include="Locales\MigrationsLocale.zh-Hant.resx" />
+    
     <EmbeddedResource Include="Locales\ModelAnalyzerLocale.cs.resx" />
     <EmbeddedResource Include="Locales\ModelAnalyzerLocale.de.resx" />
-    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.ru.resx" />
+    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.en.resx" />
     <EmbeddedResource Include="Locales\ModelAnalyzerLocale.es.resx" />
+    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.fr.resx" />
     <EmbeddedResource Include="Locales\ModelAnalyzerLocale.jp.resx" />
     <EmbeddedResource Include="Locales\ModelAnalyzerLocale.pt-BR.resx" />
+    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.ru.resx" />
     <EmbeddedResource Include="Locales\ModelAnalyzerLocale.tr.resx" />
-    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.zh-Hans.resx" />
+    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.zh-Hant.resx" />
     <EmbeddedResource Include="Locales\ModelAnalyzerLocale.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>ModelAnalyzerLocale.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.en.resx" />
     <EmbeddedResource Include="Locales\ModelAnalyzerLocale.it.resx" />
-    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.zh-Hans.resx" />
-    <EmbeddedResource Include="Locales\ModelAnalyzerLocale.zh-Hant.resx" />
+    
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.cs.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.de.resx" />
-    <EmbeddedResource Include="Locales\ReverseEngineerLocale.ru.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.en.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.es.resx" />
+    <EmbeddedResource Include="Locales\ReverseEngineerLocale.fr.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.jp.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.it.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.pt-BR.resx" />
+    <EmbeddedResource Include="Locales\ReverseEngineerLocale.ru.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.tr.resx" />
-    <EmbeddedResource Include="Locales\ReverseEngineerLocale.fr.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.zh-Hans.resx" />
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.zh-Hant.resx" />   
     <EmbeddedResource Include="Locales\ReverseEngineerLocale.resx">
@@ -368,31 +372,33 @@
       <LastGenOutput>ReverseEngineerLocale.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    
     <EmbeddedResource Include="Locales\SharedLocale.cs.resx" />
     <EmbeddedResource Include="Locales\SharedLocale.de.resx" />
-    <EmbeddedResource Include="Locales\SharedLocale.ru.resx" />
+    <EmbeddedResource Include="Locales\SharedLocale.en.resx" />
     <EmbeddedResource Include="Locales\SharedLocale.es.resx" />
+    <EmbeddedResource Include="Locales\SharedLocale.fr.resx" />
+    <EmbeddedResource Include="Locales\SharedLocale.it.resx" />
     <EmbeddedResource Include="Locales\SharedLocale.jp.resx" />
     <EmbeddedResource Include="Locales\SharedLocale.pt-BR.resx" />
+    <EmbeddedResource Include="Locales\SharedLocale.ru.resx" />
     <EmbeddedResource Include="Locales\SharedLocale.tr.resx" />
-    <EmbeddedResource Include="Locales\SharedLocale.fr.resx" />
-    <EmbeddedResource Include="Locales\SharedLocale.it.resx" />
-    <EmbeddedResource Include="Locales\SharedLocale.en.resx" />
     <EmbeddedResource Include="Locales\SharedLocale.zh-Hans.resx" />
     <EmbeddedResource Include="Locales\SharedLocale.zh-Hant.resx" />
     <EmbeddedResource Include="Locales\SharedLocale.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>SharedLocale.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    
-    <EmbeddedResource Include="Resources.en.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.en.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+
     <EmbeddedResource Include="Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources.en.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.en.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+
     <EmbeddedResource Include="VSPackage.cs.resx">
       <MergeWithCTO>true</MergeWithCTO>
       <LogicalName>VSPackage.cs.Resources</LogicalName>
@@ -401,10 +407,22 @@
       <MergeWithCTO>true</MergeWithCTO>
       <LogicalName>VSPackage.de.Resources</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="VSPackage.en.resx">
+      <MergeWithCTO>true</MergeWithCTO>
+      <LogicalName>VSPackage.en.Resources</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="VSPackage.es.resx">
       <MergeWithCTO>true</MergeWithCTO>
       <LogicalName>VSPackage.es.Resources</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="VSPackage.fr.resx">
+      <MergeWithCTO>true</MergeWithCTO>
+      <LogicalName>VSPackage.fr.Resources</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="VSPackage.it.resx">
+      <MergeWithCTO>true</MergeWithCTO>
+      <LogicalName>VSPackage.it.Resources</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="VSPackage.jp.resx">
       <MergeWithCTO>true</MergeWithCTO>
       <LogicalName>VSPackage.jp.Resources</LogicalName>
@@ -413,17 +431,13 @@
       <MergeWithCTO>true</MergeWithCTO>
       <LogicalName>VSPackage.pt-BR.Resources</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="VSPackage.tr.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <LogicalName>VSPackage.tr.Resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="VSPackage.fr.resx">
+    <EmbeddedResource Include="VSPackage.ru.resx">
       <MergeWithCTO>true</MergeWithCTO>
-      <LogicalName>VSPackage.fr.Resources</LogicalName>
+      <LogicalName>VSPackage.ru.Resources</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="VSPackage.it.resx">
+    <EmbeddedResource Include="VSPackage.tr.resx">
       <MergeWithCTO>true</MergeWithCTO>
-      <LogicalName>VSPackage.it.Resources</LogicalName>
+      <LogicalName>VSPackage.tr.Resources</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="VSPackage.zh-Hans.resx">
       <MergeWithCTO>true</MergeWithCTO>
@@ -433,14 +447,6 @@
       <MergeWithCTO>true</MergeWithCTO>
       <LogicalName>VSPackage.zh-Hant.Resources</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="VSPackage.ru.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <LogicalName>VSPackage.ru.Resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="VSPackage.en.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <LogicalName>VSPackage.en.Resources</LogicalName>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Page Include="Dialogs\AdvancedModelingOptionsDialog.xaml">
@@ -540,6 +546,9 @@
     <VSCTCompile Include="EFCorePowerToolsPackage.it.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
     </VSCTCompile>
+    <VSCTCompile Include="EFCorePowerToolsPackage.jp.vsct">
+      <ResourceName>Menus.ctmenu</ResourceName>
+    </VSCTCompile>    
     <VSCTCompile Include="EFCorePowerToolsPackage.pt-BR.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
     </VSCTCompile>