diff --git a/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.installer.yaml b/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.installer.yaml
new file mode 100644
index 000000000..57b1d51be
--- /dev/null
+++ b/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.installer.yaml
@@ -0,0 +1,26 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: Amazon.Kindle
+PackageVersion: 1.31.60170
+MinimumOSVersion: 10.0.0.0
+FileExtensions:
+  - azw
+  - azw3
+  - mobi
+  - epub
+  - pdf
+  - kfx
+InstallModes:
+  - interactive
+  - silent
+  - silentWithProgress
+Installers:
+  - Architecture: x86
+    InstallerType: nullsoft
+    InstallerUrl: https://s3.amazonaws.com/kindleforpc/60170/KindleForPC-installer-1.31.60170.exe
+    InstallerSha256: 3C5EAACE1A3DB0E67231791181B24174FA2978B2B37FF6A25D238299C1CB29DA
+#    ProductCode: 
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+ManifestType: installer
+ManifestVersion: 1.0.0
diff --git a/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.locale.en-US.yaml b/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.locale.en-US.yaml
new file mode 100644
index 000000000..bf4145174
--- /dev/null
+++ b/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.locale.en-US.yaml
@@ -0,0 +1,31 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: Amazon.Kindle
+PackageVersion: 1.31.60170
+PackageLocale: en-US
+Publisher: Amazon
+PublisherUrl: https://www.amazon.com/
+PublisherSupportUrl: https://www.amazon.com/gp/help/customer/display.html?nodeId=GAJYEL5VJLU5KF6L
+PrivacyUrl: https://www.amazon.com/gp/help/customer/display.html?nodeId=GX7NJQ4ZB8MHFRNJ
+#Author: 
+PackageName: Amazon Kindle
+PackageUrl: https://www.amazon.com/kindle-dbs/fd/kcp
+License: Copyright (c) 1996-2021, Amazon.com, Inc. or its affiliates
+Copyright: Copyright (c) 1996-2021, Amazon.com, Inc. or its affiliates
+CopyrightUrl: https://www.amazon.com/gp/help/customer/display.html?nodeId=200499360
+ShortDescription: Your library on your PC - read your books on your PC with the free Kindle app.
+Description: The Kindle app is available for most major smartphones, tablets and computers. That means with our free Kindle reading apps, you can buy a Kindle book once, and read it on any device with the Kindle app installed*. You can also read that same Kindle book on a Kindle device if you own one.
+Moniker: kindle
+Tags:
+  - reading
+  - epub
+  - reader
+  - books
+  - amazon
+  - kindle
+  - ebook
+  - e-book
+  - ereader
+  - e-reader
+  - library
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
diff --git a/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.yaml b/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.yaml
index 11c47144d..b1401501d 100644
--- a/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.yaml
+++ b/manifests/a/Amazon/Kindle/1.31.60170/Amazon.Kindle.yaml
@@ -1,28 +1,6 @@
-# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.0.0.schema.json
-PackageName: Amazon Kindle
-Publisher: Amazon
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: Amazon.Kindle
 PackageVersion: 1.31.60170
-Moniker: kindle
-License: Copyright (c) Amazon.com, Inc. or its affiliates
-Tags:
-- reading
-- epub
-- reader
-- books
-- amazon
-- kindle
-InstallerType: exe
-ShortDescription: Amazon.Kindle
-Description: The Kindle app is available for most major smartphones, tablets and computers. That means with our free Kindle reading apps, you can buy a Kindle book once, and read it on any device with the Kindle app installed*. You can also read that same Kindle book on a Kindle device if you own one.
-PackageUrl: https://www.amazon.co.uk/kindle-dbs/fd/kcp
-LicenseUrl: https://www.amazon.com/gp/help/customer/display.html?nodeId=200699130
-Installers:
-- Architecture: x86
-  InstallerUrl: https://s3.amazonaws.com/kindleforpc/60170/KindleForPC-installer-1.31.60170.exe
-  InstallerSha256: 3C5EAACE1A3DB0E67231791181B24174FA2978B2B37FF6A25D238299C1CB29DA
-  InstallerType: nullsoft
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
-