diff --git a/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.installer.yaml b/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.installer.yaml
new file mode 100644
index 000000000..d0871419a
--- /dev/null
+++ b/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.installer.yaml
@@ -0,0 +1,27 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: Notepad++.Notepad++
+PackageVersion: 7.9.5
+MinimumOSVersion: 10.0.0.0
+InstallModes:
+  - interactive
+  - silent
+  - silentWithProgress
+Installers:
+  - Architecture: x64
+    InstallerType: nullsoft
+    InstallerUrl: https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.9.5/npp.7.9.5.Installer.x64.exe
+    InstallerSha256: 4881548CD86491B453520E83C19292C93B9C6CE485A1F9EB9301E3913A9BACED
+#    ProductCode: 
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+  - Architecture: x86
+    InstallerType: nullsoft
+    InstallerUrl: https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.9.5/npp.7.9.5.Installer.exe
+    InstallerSha256: E44CAEEFEED617D7B791FAE64A7724B73EEDA1C9F96254BDF0E2CC48BD69A792
+#    ProductCode: 
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+ManifestType: installer
+ManifestVersion: 1.0.0
diff --git a/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.locale.en-US.yaml b/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.locale.en-US.yaml
new file mode 100644
index 000000000..c79fdda7d
--- /dev/null
+++ b/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.locale.en-US.yaml
@@ -0,0 +1,27 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: Notepad++.Notepad++
+PackageVersion: 7.9.5
+PackageLocale: en-US
+Publisher: Notepad++
+#PublisherUrl: 
+#PublisherSupportUrl: 
+#PrivacyUrl: 
+Author: Don Ho
+PackageName: Notepad++
+PackageUrl: https://notepad-plus-plus.org/
+License: GPL-2.0-only
+LicenseUrl: https://raw.githubusercontent.com/notepad-plus-plus/notepad-plus-plus/v7.9.5/LICENSE
+#Copyright: 
+#CopyrightUrl: 
+ShortDescription: Notepad++ is a free (as in “free speech” and also as in “free beer”) source code editor and Notepad replacement that supports several languages. Running in the MS Windows environment, its use is governed by GNU General Public License.
+#Description: 
+Moniker: notepad++
+Tags:
+  - notepad
+  - notepadplusplus
+  - editor
+  - text
+  - development
+  - foss
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
diff --git a/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.yaml b/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.yaml
index 5af6db7d5..46646da88 100644
--- a/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.yaml
+++ b/manifests/n/Notepad++/Notepad++/7.9.5/Notepad++.Notepad++.yaml
@@ -1,21 +1,6 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: Notepad++.Notepad++
-PackageName: Notepad++
-Moniker: notepad++
 PackageVersion: 7.9.5
-Publisher: Notepad++
-Author: Notepad++
-License: (c) 2021 Notepad++
-LicenseUrl: https://raw.githubusercontent.com/notepad-plus-plus/notepad-plus-plus/v7.9.5/LICENSE
-ShortDescription: Notepad++ is a free (as in “free speech” and also as in “free beer”) source code editor and Notepad replacement that supports several languages. Running in the MS Windows environment, its use is governed by GNU General Public License.
-PackageUrl: https://notepad-plus-plus.org/
-Installers:
-- Architecture: x64
-  InstallerUrl: https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.9.5/npp.7.9.5.Installer.x64.exe
-  InstallerSha256: 4881548cd86491b453520e83c19292c93b9c6ce485a1f9eb9301e3913a9baced
-  InstallerType: nullsoft
-  InstallerSwitches:
-    Silent: /S
-    SilentWithProgress: /S
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0