diff --git a/ModernKeePass/ModernKeePassApp.csproj b/ModernKeePass/ModernKeePassApp.csproj
index 3fdc9e4..8683979 100644
--- a/ModernKeePass/ModernKeePassApp.csproj
+++ b/ModernKeePass/ModernKeePassApp.csproj
@@ -318,6 +318,27 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
+    <Content Include="appMetadata\en-us\baselisting\description.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\description.Entry.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\description.Group.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\description.New.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\description.Open.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\description.Recent.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\description.Search.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\description.Semantic.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\description.Settings.txt" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\Entry.png" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\Group.png" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\New.png" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\Open.png" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\Recent.png" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\Search.png" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\Semantic.png" />
+    <Content Include="appMetadata\en-us\baselisting\images\Screenshot\Settings.png" />
+    <Content Include="appMetadata\en-us\baselisting\keywords.txt" />
+    <Content Include="appMetadata\en-us\baselisting\privacyPolicy.txt" />
+    <Content Include="appMetadata\en-us\baselisting\releaseNotes.txt" />
+    <Content Include="appMetadata\en-us\baselisting\websiteUrl.txt" />
     <Content Include="Assets\Logo.scale-100.png" />
     <Content Include="Assets\Logo.scale-140.png" />
     <Content Include="Assets\Logo.scale-180.png" />
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/description.txt b/ModernKeePass/appMetadata/en-us/baselisting/description.txt
new file mode 100644
index 0000000..e88bb75
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/description.txt
@@ -0,0 +1,5 @@
+ModernKeePass is free, open-source and user friendly yet secure password manager, based on proven and certified technology from KeePass 2.x.
+You can create, open and edit Keepass 2.x password databases.
+
+It is not intended to replicate all features of the original application, but aims at being simple to use. Suggestions welcome!
+Works in Windows 10, 8.1 and RT.
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Entry.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Entry.png
new file mode 100644
index 0000000..93248ee
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Entry.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Group.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Group.png
new file mode 100644
index 0000000..a7f5692
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Group.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/New.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/New.png
new file mode 100644
index 0000000..d677d4f
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/New.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Open.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Open.png
new file mode 100644
index 0000000..7e40b15
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Open.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Recent.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Recent.png
new file mode 100644
index 0000000..33e7a1d
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Recent.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Search.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Search.png
new file mode 100644
index 0000000..f6c1a76
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Search.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Semantic.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Semantic.png
new file mode 100644
index 0000000..3b052ce
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Semantic.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Settings.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Settings.png
new file mode 100644
index 0000000..e66a463
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Settings.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Entry.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Entry.txt
new file mode 100644
index 0000000..02868e0
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Entry.txt
@@ -0,0 +1 @@
+Entry page with password generator
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Group.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Group.txt
new file mode 100644
index 0000000..58e9520
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Group.txt
@@ -0,0 +1 @@
+Group view, with subgroups and entries
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.New.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.New.txt
new file mode 100644
index 0000000..2d0457d
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.New.txt
@@ -0,0 +1 @@
+Create new databases, with a password and/or with a new or existing key file
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Open.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Open.txt
new file mode 100644
index 0000000..8421422
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Open.txt
@@ -0,0 +1 @@
+Open database with password and key files
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Recent.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Recent.txt
new file mode 100644
index 0000000..6b5ca48
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Recent.txt
@@ -0,0 +1 @@
+Open recent files
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Search.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Search.txt
new file mode 100644
index 0000000..8627031
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Search.txt
@@ -0,0 +1 @@
+Search your entries
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Semantic.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Semantic.txt
new file mode 100644
index 0000000..c4d6ea1
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Semantic.txt
@@ -0,0 +1 @@
+See everything quickly with the semantic zoom
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Settings.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Settings.txt
new file mode 100644
index 0000000..e2af630
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Settings.txt
@@ -0,0 +1 @@
+Application settings
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/keywords.txt b/ModernKeePass/appMetadata/en-us/baselisting/keywords.txt
new file mode 100644
index 0000000..6eb8f06
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/keywords.txt
@@ -0,0 +1,4 @@
+Keepass
+Password
+Password Manager
+KDBX
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/privacyPolicy.txt b/ModernKeePass/appMetadata/en-us/baselisting/privacyPolicy.txt
new file mode 100644
index 0000000..86cc090
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/privacyPolicy.txt
@@ -0,0 +1 @@
+https://github.com/wismna/ModernKeePass/blob/master/PRIVACY
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
new file mode 100644
index 0000000..ea4eeff
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
@@ -0,0 +1,3 @@
+Bug corrections with key files management
+Clearer error messages
+Show an error message if database save issue
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/websiteUrl.txt b/ModernKeePass/appMetadata/en-us/baselisting/websiteUrl.txt
new file mode 100644
index 0000000..77167e3
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/websiteUrl.txt
@@ -0,0 +1 @@
+https://github.com/wismna/ModernKeePass
\ No newline at end of file