diff --git a/.vs/KiwixWebApp/v15/.suo b/.vs/KiwixWebApp/v15/.suo
index 8024a128..3e26e280 100644
Binary files a/.vs/KiwixWebApp/v15/.suo and b/.vs/KiwixWebApp/v15/.suo differ
diff --git a/KiwixWebApp.jsproj b/KiwixWebApp.jsproj
index c10d22be..3cadcfbe 100644
--- a/KiwixWebApp.jsproj
+++ b/KiwixWebApp.jsproj
@@ -64,6 +64,56 @@
     <AppxManifest Include="package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
+    <Content Include="images\BadgeLogo.scale-100.png" />
+    <Content Include="images\BadgeLogo.scale-125.png" />
+    <Content Include="images\BadgeLogo.scale-150.png" />
+    <Content Include="images\BadgeLogo.scale-200.png" />
+    <Content Include="images\BadgeLogo.scale-400.png" />
+    <Content Include="images\LargeTile.scale-100.png" />
+    <Content Include="images\LargeTile.scale-125.png" />
+    <Content Include="images\LargeTile.scale-150.png" />
+    <Content Include="images\LargeTile.scale-200.png" />
+    <Content Include="images\LargeTile.scale-400.png" />
+    <Content Include="images\SmallTile.scale-100.png" />
+    <Content Include="images\SmallTile.scale-125.png" />
+    <Content Include="images\SmallTile.scale-150.png" />
+    <Content Include="images\SmallTile.scale-200.png" />
+    <Content Include="images\SmallTile.scale-400.png" />
+    <Content Include="images\splashscreen.scale-100.png" />
+    <Content Include="images\splashscreen.scale-125.png" />
+    <Content Include="images\splashscreen.scale-150.png" />
+    <Content Include="images\splashscreen.scale-200.png" />
+    <Content Include="images\splashscreen.scale-400.png" />
+    <Content Include="images\Square150x150Logo.scale-100.png" />
+    <Content Include="images\Square150x150Logo.scale-125.png" />
+    <Content Include="images\Square150x150Logo.scale-150.png" />
+    <Content Include="images\Square150x150Logo.scale-200.png" />
+    <Content Include="images\Square150x150Logo.scale-400.png" />
+    <Content Include="images\Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Include="images\Square44x44Logo.altform-unplated_targetsize-256.png" />
+    <Content Include="images\Square44x44Logo.altform-unplated_targetsize-32.png" />
+    <Content Include="images\Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Include="images\Square44x44Logo.scale-100.png" />
+    <Content Include="images\Square44x44Logo.scale-125.png" />
+    <Content Include="images\Square44x44Logo.scale-150.png" />
+    <Content Include="images\Square44x44Logo.scale-200.png" />
+    <Content Include="images\Square44x44Logo.scale-400.png" />
+    <Content Include="images\Square44x44Logo.targetsize-16.png" />
+    <Content Include="images\Square44x44Logo.targetsize-24.png" />
+    <Content Include="images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="images\Square44x44Logo.targetsize-256.png" />
+    <Content Include="images\Square44x44Logo.targetsize-32.png" />
+    <Content Include="images\Square44x44Logo.targetsize-48.png" />
+    <Content Include="images\storelogo.scale-100.png" />
+    <Content Include="images\storelogo.scale-125.png" />
+    <Content Include="images\storelogo.scale-150.png" />
+    <Content Include="images\storelogo.scale-200.png" />
+    <Content Include="images\storelogo.scale-400.png" />
+    <Content Include="images\Wide310x150Logo.scale-100.png" />
+    <Content Include="images\Wide310x150Logo.scale-125.png" />
+    <Content Include="images\Wide310x150Logo.scale-150.png" />
+    <Content Include="images\Wide310x150Logo.scale-200.png" />
+    <Content Include="images\Wide310x150Logo.scale-400.png" />
     <Content Include="www\A\dummyArticle.html" />
     <Content Include="www\css\app.css" />
     <Content Include="www\css\bootstrap-theme.css" />
@@ -75,56 +125,6 @@
     <Content Include="www\fonts\glyphicons-halflings-regular.ttf" />
     <Content Include="www\fonts\glyphicons-halflings-regular.woff" />
     <Content Include="www\fonts\glyphicons-halflings-regular.woff2" />
-    <Content Include="www\images\BadgeLogo.scale-100.png" />
-    <Content Include="www\images\BadgeLogo.scale-125.png" />
-    <Content Include="www\images\BadgeLogo.scale-150.png" />
-    <Content Include="www\images\BadgeLogo.scale-200.png" />
-    <Content Include="www\images\BadgeLogo.scale-400.png" />
-    <Content Include="www\images\LargeTile.scale-100.png" />
-    <Content Include="www\images\LargeTile.scale-125.png" />
-    <Content Include="www\images\LargeTile.scale-150.png" />
-    <Content Include="www\images\LargeTile.scale-200.png" />
-    <Content Include="www\images\LargeTile.scale-400.png" />
-    <Content Include="www\images\SmallTile.scale-100.png" />
-    <Content Include="www\images\SmallTile.scale-125.png" />
-    <Content Include="www\images\SmallTile.scale-150.png" />
-    <Content Include="www\images\SmallTile.scale-200.png" />
-    <Content Include="www\images\SmallTile.scale-400.png" />
-    <Content Include="www\images\splashscreen.scale-100.png" />
-    <Content Include="www\images\splashscreen.scale-125.png" />
-    <Content Include="www\images\splashscreen.scale-150.png" />
-    <Content Include="www\images\splashscreen.scale-200.png" />
-    <Content Include="www\images\splashscreen.scale-400.png" />
-    <Content Include="www\images\Square150x150Logo.scale-100.png" />
-    <Content Include="www\images\Square150x150Logo.scale-125.png" />
-    <Content Include="www\images\Square150x150Logo.scale-150.png" />
-    <Content Include="www\images\Square150x150Logo.scale-200.png" />
-    <Content Include="www\images\Square150x150Logo.scale-400.png" />
-    <Content Include="www\images\Square44x44Logo.altform-unplated_targetsize-16.png" />
-    <Content Include="www\images\Square44x44Logo.altform-unplated_targetsize-256.png" />
-    <Content Include="www\images\Square44x44Logo.altform-unplated_targetsize-32.png" />
-    <Content Include="www\images\Square44x44Logo.altform-unplated_targetsize-48.png" />
-    <Content Include="www\images\Square44x44Logo.scale-100.png" />
-    <Content Include="www\images\Square44x44Logo.scale-125.png" />
-    <Content Include="www\images\Square44x44Logo.scale-150.png" />
-    <Content Include="www\images\Square44x44Logo.scale-200.png" />
-    <Content Include="www\images\Square44x44Logo.scale-400.png" />
-    <Content Include="www\images\Square44x44Logo.targetsize-16.png" />
-    <Content Include="www\images\Square44x44Logo.targetsize-24.png" />
-    <Content Include="www\images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="www\images\Square44x44Logo.targetsize-256.png" />
-    <Content Include="www\images\Square44x44Logo.targetsize-32.png" />
-    <Content Include="www\images\Square44x44Logo.targetsize-48.png" />
-    <Content Include="www\images\storelogo.scale-100.png" />
-    <Content Include="www\images\storelogo.scale-125.png" />
-    <Content Include="www\images\storelogo.scale-150.png" />
-    <Content Include="www\images\storelogo.scale-200.png" />
-    <Content Include="www\images\storelogo.scale-400.png" />
-    <Content Include="www\images\Wide310x150Logo.scale-100.png" />
-    <Content Include="www\images\Wide310x150Logo.scale-125.png" />
-    <Content Include="www\images\Wide310x150Logo.scale-150.png" />
-    <Content Include="www\images\Wide310x150Logo.scale-200.png" />
-    <Content Include="www\images\Wide310x150Logo.scale-400.png" />
     <Content Include="www\img\icons\kiwix-120.png" />
     <Content Include="www\img\icons\kiwix-1240.png" />
     <Content Include="www\img\icons\kiwix-128.png" />
diff --git a/bin/Debug/AppX/AppxManifest.xml b/bin/Debug/AppX/AppxManifest.xml
index 293ad6d8..ad3510d2 100644
--- a/bin/Debug/AppX/AppxManifest.xml
+++ b/bin/Debug/AppX/AppxManifest.xml
@@ -12,7 +12,7 @@
   <Properties>
     <DisplayName>Kiwix JS</DisplayName>
     <PublisherDisplayName>Peribanu</PublisherDisplayName>
-    <Logo>www\images\storelogo.png</Logo>
+    <Logo>images\storelogo.png</Logo>
   </Properties>
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10240.0" MaxVersionTested="10.0.15063.0" />
@@ -25,16 +25,16 @@
       <uap:ApplicationContentUriRules>
         <uap:Rule Match="ms-appx-web:///www/index.html" Type="include" WindowsRuntimeAccess="none" />
       </uap:ApplicationContentUriRules>
-      <uap:VisualElements DisplayName="Kiwix JS" Description="Kiwix Offline Wikipedia and ZIM File Reader" BackgroundColor="transparent" Square150x150Logo="www\images\Square150x150Logo.png" Square44x44Logo="www\images\Square44x44Logo.png">
-        <uap:DefaultTile ShortName="Kiwix JS" Square310x310Logo="www\images\LargeTile.png" Wide310x150Logo="www\images\Wide310x150Logo.png" Square71x71Logo="www\images\SmallTile.png">
+      <uap:VisualElements DisplayName="Kiwix JS" Description="Kiwix Offline Wikipedia and ZIM File Reader" BackgroundColor="transparent" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
+        <uap:DefaultTile ShortName="Kiwix JS" Square310x310Logo="images\LargeTile.png" Wide310x150Logo="images\Wide310x150Logo.png" Square71x71Logo="images\SmallTile.png">
           <uap:ShowNameOnTiles>
             <uap:ShowOn Tile="square150x150Logo" />
             <uap:ShowOn Tile="wide310x150Logo" />
             <uap:ShowOn Tile="square310x310Logo" />
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
-        <uap:LockScreen Notification="badge" BadgeLogo="www\images\BadgeLogo.png" />
-        <uap:SplashScreen Image="www\images\splashscreen.png" BackgroundColor="transparent" />
+        <uap:LockScreen Notification="badge" BadgeLogo="images\BadgeLogo.png" />
+        <uap:SplashScreen Image="images\splashscreen.png" BackgroundColor="transparent" />
         <uap:InitialRotationPreference>
           <uap:Rotation Preference="portrait" />
           <uap:Rotation Preference="landscape" />
diff --git a/bin/Debug/AppX/www/images/BadgeLogo.scale-100.png b/bin/Debug/AppX/images/BadgeLogo.scale-100.png
similarity index 100%
rename from bin/Debug/AppX/www/images/BadgeLogo.scale-100.png
rename to bin/Debug/AppX/images/BadgeLogo.scale-100.png
diff --git a/bin/Debug/AppX/www/images/BadgeLogo.scale-125.png b/bin/Debug/AppX/images/BadgeLogo.scale-125.png
similarity index 100%
rename from bin/Debug/AppX/www/images/BadgeLogo.scale-125.png
rename to bin/Debug/AppX/images/BadgeLogo.scale-125.png
diff --git a/bin/Debug/AppX/www/images/BadgeLogo.scale-150.png b/bin/Debug/AppX/images/BadgeLogo.scale-150.png
similarity index 100%
rename from bin/Debug/AppX/www/images/BadgeLogo.scale-150.png
rename to bin/Debug/AppX/images/BadgeLogo.scale-150.png
diff --git a/bin/Debug/AppX/www/images/BadgeLogo.scale-200.png b/bin/Debug/AppX/images/BadgeLogo.scale-200.png
similarity index 100%
rename from bin/Debug/AppX/www/images/BadgeLogo.scale-200.png
rename to bin/Debug/AppX/images/BadgeLogo.scale-200.png
diff --git a/bin/Debug/AppX/www/images/BadgeLogo.scale-400.png b/bin/Debug/AppX/images/BadgeLogo.scale-400.png
similarity index 100%
rename from bin/Debug/AppX/www/images/BadgeLogo.scale-400.png
rename to bin/Debug/AppX/images/BadgeLogo.scale-400.png
diff --git a/bin/Debug/AppX/www/images/LargeTile.scale-100.png b/bin/Debug/AppX/images/LargeTile.scale-100.png
similarity index 100%
rename from bin/Debug/AppX/www/images/LargeTile.scale-100.png
rename to bin/Debug/AppX/images/LargeTile.scale-100.png
diff --git a/bin/Debug/AppX/www/images/LargeTile.scale-125.png b/bin/Debug/AppX/images/LargeTile.scale-125.png
similarity index 100%
rename from bin/Debug/AppX/www/images/LargeTile.scale-125.png
rename to bin/Debug/AppX/images/LargeTile.scale-125.png
diff --git a/bin/Debug/AppX/www/images/LargeTile.scale-150.png b/bin/Debug/AppX/images/LargeTile.scale-150.png
similarity index 100%
rename from bin/Debug/AppX/www/images/LargeTile.scale-150.png
rename to bin/Debug/AppX/images/LargeTile.scale-150.png
diff --git a/bin/Debug/AppX/www/images/LargeTile.scale-200.png b/bin/Debug/AppX/images/LargeTile.scale-200.png
similarity index 100%
rename from bin/Debug/AppX/www/images/LargeTile.scale-200.png
rename to bin/Debug/AppX/images/LargeTile.scale-200.png
diff --git a/bin/Debug/AppX/www/images/LargeTile.scale-400.png b/bin/Debug/AppX/images/LargeTile.scale-400.png
similarity index 100%
rename from bin/Debug/AppX/www/images/LargeTile.scale-400.png
rename to bin/Debug/AppX/images/LargeTile.scale-400.png
diff --git a/bin/Debug/AppX/www/images/SmallTile.scale-100.png b/bin/Debug/AppX/images/SmallTile.scale-100.png
similarity index 100%
rename from bin/Debug/AppX/www/images/SmallTile.scale-100.png
rename to bin/Debug/AppX/images/SmallTile.scale-100.png
diff --git a/bin/Debug/AppX/www/images/SmallTile.scale-125.png b/bin/Debug/AppX/images/SmallTile.scale-125.png
similarity index 100%
rename from bin/Debug/AppX/www/images/SmallTile.scale-125.png
rename to bin/Debug/AppX/images/SmallTile.scale-125.png
diff --git a/bin/Debug/AppX/www/images/SmallTile.scale-150.png b/bin/Debug/AppX/images/SmallTile.scale-150.png
similarity index 100%
rename from bin/Debug/AppX/www/images/SmallTile.scale-150.png
rename to bin/Debug/AppX/images/SmallTile.scale-150.png
diff --git a/bin/Debug/AppX/www/images/SmallTile.scale-200.png b/bin/Debug/AppX/images/SmallTile.scale-200.png
similarity index 100%
rename from bin/Debug/AppX/www/images/SmallTile.scale-200.png
rename to bin/Debug/AppX/images/SmallTile.scale-200.png
diff --git a/bin/Debug/AppX/www/images/SmallTile.scale-400.png b/bin/Debug/AppX/images/SmallTile.scale-400.png
similarity index 100%
rename from bin/Debug/AppX/www/images/SmallTile.scale-400.png
rename to bin/Debug/AppX/images/SmallTile.scale-400.png
diff --git a/bin/Debug/AppX/www/images/Square150x150Logo.scale-100.png b/bin/Debug/AppX/images/Square150x150Logo.scale-100.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square150x150Logo.scale-100.png
rename to bin/Debug/AppX/images/Square150x150Logo.scale-100.png
diff --git a/bin/Debug/AppX/www/images/Square150x150Logo.scale-125.png b/bin/Debug/AppX/images/Square150x150Logo.scale-125.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square150x150Logo.scale-125.png
rename to bin/Debug/AppX/images/Square150x150Logo.scale-125.png
diff --git a/bin/Debug/AppX/www/images/Square150x150Logo.scale-150.png b/bin/Debug/AppX/images/Square150x150Logo.scale-150.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square150x150Logo.scale-150.png
rename to bin/Debug/AppX/images/Square150x150Logo.scale-150.png
diff --git a/bin/Debug/AppX/www/images/Square150x150Logo.scale-200.png b/bin/Debug/AppX/images/Square150x150Logo.scale-200.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square150x150Logo.scale-200.png
rename to bin/Debug/AppX/images/Square150x150Logo.scale-200.png
diff --git a/bin/Debug/AppX/www/images/Square150x150Logo.scale-400.png b/bin/Debug/AppX/images/Square150x150Logo.scale-400.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square150x150Logo.scale-400.png
rename to bin/Debug/AppX/images/Square150x150Logo.scale-400.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.altform-unplated_targetsize-16.png b/bin/Debug/AppX/images/Square44x44Logo.altform-unplated_targetsize-16.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.altform-unplated_targetsize-16.png
rename to bin/Debug/AppX/images/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.altform-unplated_targetsize-256.png b/bin/Debug/AppX/images/Square44x44Logo.altform-unplated_targetsize-256.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.altform-unplated_targetsize-256.png
rename to bin/Debug/AppX/images/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.altform-unplated_targetsize-32.png b/bin/Debug/AppX/images/Square44x44Logo.altform-unplated_targetsize-32.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.altform-unplated_targetsize-32.png
rename to bin/Debug/AppX/images/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.altform-unplated_targetsize-48.png b/bin/Debug/AppX/images/Square44x44Logo.altform-unplated_targetsize-48.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.altform-unplated_targetsize-48.png
rename to bin/Debug/AppX/images/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.scale-100.png b/bin/Debug/AppX/images/Square44x44Logo.scale-100.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.scale-100.png
rename to bin/Debug/AppX/images/Square44x44Logo.scale-100.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.scale-125.png b/bin/Debug/AppX/images/Square44x44Logo.scale-125.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.scale-125.png
rename to bin/Debug/AppX/images/Square44x44Logo.scale-125.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.scale-150.png b/bin/Debug/AppX/images/Square44x44Logo.scale-150.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.scale-150.png
rename to bin/Debug/AppX/images/Square44x44Logo.scale-150.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.scale-200.png b/bin/Debug/AppX/images/Square44x44Logo.scale-200.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.scale-200.png
rename to bin/Debug/AppX/images/Square44x44Logo.scale-200.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.scale-400.png b/bin/Debug/AppX/images/Square44x44Logo.scale-400.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.scale-400.png
rename to bin/Debug/AppX/images/Square44x44Logo.scale-400.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.targetsize-16.png b/bin/Debug/AppX/images/Square44x44Logo.targetsize-16.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.targetsize-16.png
rename to bin/Debug/AppX/images/Square44x44Logo.targetsize-16.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.targetsize-24.png b/bin/Debug/AppX/images/Square44x44Logo.targetsize-24.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.targetsize-24.png
rename to bin/Debug/AppX/images/Square44x44Logo.targetsize-24.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.targetsize-24_altform-unplated.png b/bin/Debug/AppX/images/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.targetsize-24_altform-unplated.png
rename to bin/Debug/AppX/images/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.targetsize-256.png b/bin/Debug/AppX/images/Square44x44Logo.targetsize-256.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.targetsize-256.png
rename to bin/Debug/AppX/images/Square44x44Logo.targetsize-256.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.targetsize-32.png b/bin/Debug/AppX/images/Square44x44Logo.targetsize-32.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.targetsize-32.png
rename to bin/Debug/AppX/images/Square44x44Logo.targetsize-32.png
diff --git a/bin/Debug/AppX/www/images/Square44x44Logo.targetsize-48.png b/bin/Debug/AppX/images/Square44x44Logo.targetsize-48.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Square44x44Logo.targetsize-48.png
rename to bin/Debug/AppX/images/Square44x44Logo.targetsize-48.png
diff --git a/bin/Debug/AppX/www/images/Wide310x150Logo.scale-100.png b/bin/Debug/AppX/images/Wide310x150Logo.scale-100.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Wide310x150Logo.scale-100.png
rename to bin/Debug/AppX/images/Wide310x150Logo.scale-100.png
diff --git a/bin/Debug/AppX/www/images/Wide310x150Logo.scale-125.png b/bin/Debug/AppX/images/Wide310x150Logo.scale-125.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Wide310x150Logo.scale-125.png
rename to bin/Debug/AppX/images/Wide310x150Logo.scale-125.png
diff --git a/bin/Debug/AppX/www/images/Wide310x150Logo.scale-150.png b/bin/Debug/AppX/images/Wide310x150Logo.scale-150.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Wide310x150Logo.scale-150.png
rename to bin/Debug/AppX/images/Wide310x150Logo.scale-150.png
diff --git a/bin/Debug/AppX/www/images/Wide310x150Logo.scale-200.png b/bin/Debug/AppX/images/Wide310x150Logo.scale-200.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Wide310x150Logo.scale-200.png
rename to bin/Debug/AppX/images/Wide310x150Logo.scale-200.png
diff --git a/bin/Debug/AppX/www/images/Wide310x150Logo.scale-400.png b/bin/Debug/AppX/images/Wide310x150Logo.scale-400.png
similarity index 100%
rename from bin/Debug/AppX/www/images/Wide310x150Logo.scale-400.png
rename to bin/Debug/AppX/images/Wide310x150Logo.scale-400.png
diff --git a/bin/Debug/AppX/www/images/splashscreen.scale-100.png b/bin/Debug/AppX/images/splashscreen.scale-100.png
similarity index 100%
rename from bin/Debug/AppX/www/images/splashscreen.scale-100.png
rename to bin/Debug/AppX/images/splashscreen.scale-100.png
diff --git a/bin/Debug/AppX/www/images/splashscreen.scale-125.png b/bin/Debug/AppX/images/splashscreen.scale-125.png
similarity index 100%
rename from bin/Debug/AppX/www/images/splashscreen.scale-125.png
rename to bin/Debug/AppX/images/splashscreen.scale-125.png
diff --git a/bin/Debug/AppX/www/images/splashscreen.scale-150.png b/bin/Debug/AppX/images/splashscreen.scale-150.png
similarity index 100%
rename from bin/Debug/AppX/www/images/splashscreen.scale-150.png
rename to bin/Debug/AppX/images/splashscreen.scale-150.png
diff --git a/bin/Debug/AppX/www/images/splashscreen.scale-200.png b/bin/Debug/AppX/images/splashscreen.scale-200.png
similarity index 100%
rename from bin/Debug/AppX/www/images/splashscreen.scale-200.png
rename to bin/Debug/AppX/images/splashscreen.scale-200.png
diff --git a/bin/Debug/AppX/www/images/splashscreen.scale-400.png b/bin/Debug/AppX/images/splashscreen.scale-400.png
similarity index 100%
rename from bin/Debug/AppX/www/images/splashscreen.scale-400.png
rename to bin/Debug/AppX/images/splashscreen.scale-400.png
diff --git a/bin/Debug/AppX/www/images/storelogo.scale-100.png b/bin/Debug/AppX/images/storelogo.scale-100.png
similarity index 100%
rename from bin/Debug/AppX/www/images/storelogo.scale-100.png
rename to bin/Debug/AppX/images/storelogo.scale-100.png
diff --git a/bin/Debug/AppX/www/images/storelogo.scale-125.png b/bin/Debug/AppX/images/storelogo.scale-125.png
similarity index 100%
rename from bin/Debug/AppX/www/images/storelogo.scale-125.png
rename to bin/Debug/AppX/images/storelogo.scale-125.png
diff --git a/bin/Debug/AppX/www/images/storelogo.scale-150.png b/bin/Debug/AppX/images/storelogo.scale-150.png
similarity index 100%
rename from bin/Debug/AppX/www/images/storelogo.scale-150.png
rename to bin/Debug/AppX/images/storelogo.scale-150.png
diff --git a/bin/Debug/AppX/www/images/storelogo.scale-200.png b/bin/Debug/AppX/images/storelogo.scale-200.png
similarity index 100%
rename from bin/Debug/AppX/www/images/storelogo.scale-200.png
rename to bin/Debug/AppX/images/storelogo.scale-200.png
diff --git a/bin/Debug/AppX/www/images/storelogo.scale-400.png b/bin/Debug/AppX/images/storelogo.scale-400.png
similarity index 100%
rename from bin/Debug/AppX/www/images/storelogo.scale-400.png
rename to bin/Debug/AppX/images/storelogo.scale-400.png
diff --git a/bin/Debug/AppX/resources.pri b/bin/Debug/AppX/resources.pri
index cd5a2380..f6916b2a 100644
Binary files a/bin/Debug/AppX/resources.pri and b/bin/Debug/AppX/resources.pri differ
diff --git a/bin/Debug/AppX/vs.appxrecipe b/bin/Debug/AppX/vs.appxrecipe
index 51b0876c..e2f9ff60 100644
--- a/bin/Debug/AppX/vs.appxrecipe
+++ b/bin/Debug/AppX/vs.appxrecipe
@@ -20,7 +20,7 @@
     <WindowsSdkPath>
     </WindowsSdkPath>
     <LayoutDir>C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\AppX</LayoutDir>
-    <RegisteredManifestChecksum>33E136DB8665C7513C90BEE5AA976ED0BC4B72867A2C015E4029DAB3CDC46FEA</RegisteredManifestChecksum>
+    <RegisteredManifestChecksum>A726F480CB43CA7F99F28C6D0132EF751FA542FA85119FE6858AFE36888A99DE</RegisteredManifestChecksum>
     <RegisteredPackageMoniker>a1a5e0b9-13d4-41fb-810d-518949f03df4_0.1.6.0_neutral__zfxmafgedzx24</RegisteredPackageMoniker>
     <RegisteredUserModeAppID>a1a5e0b9-13d4-41fb-810d-518949f03df4_zfxmafgedzx24!App</RegisteredUserModeAppID>
     <RegisteredPackageID>a1a5e0b9-13d4-41fb-810d-518949f03df4</RegisteredPackageID>
@@ -32,305 +32,257 @@
     <AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\AppxManifest.xml">
       <PackagePath>AppxManifest.xml</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
-      <Modified>2017-06-14T21:24:51.729</Modified>
+      <Modified>2017-06-14T21:36:06.437</Modified>
     </AppXManifest>
   </ItemGroup>
   <ItemGroup>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\A\dummyArticle.html">
-      <PackagePath>www\A\dummyArticle.html</PackagePath>
-      <Modified>2017-06-14T06:42:47.009</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\index.html">
-      <PackagePath>www\index.html</PackagePath>
-      <Modified>2017-06-14T11:40:07.161</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\app.css">
-      <PackagePath>www\css\app.css</PackagePath>
-      <Modified>2017-06-14T06:43:49.206</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap-theme.css">
-      <PackagePath>www\css\bootstrap-theme.css</PackagePath>
-      <Modified>2017-06-14T06:44:32.558</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap.css">
-      <PackagePath>www\css\bootstrap.css</PackagePath>
-      <Modified>2017-06-14T06:45:08.948</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\default.css">
-      <PackagePath>www\css\default.css</PackagePath>
-      <Modified>2017-06-12T05:33:43.335</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\favicon.ico">
-      <PackagePath>www\favicon.ico</PackagePath>
-      <Modified>2017-06-07T06:55:52.661</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.eot">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.eot</PackagePath>
-      <Modified>2017-06-07T06:55:52.827</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.svg">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.svg</PackagePath>
-      <Modified>2017-06-07T06:55:52.853</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.ttf">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.ttf</PackagePath>
-      <Modified>2017-06-07T06:55:52.880</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.woff">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.woff</PackagePath>
-      <Modified>2017-06-07T06:55:52.901</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.woff2">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.woff2</PackagePath>
-      <Modified>2017-06-07T06:55:52.922</Modified>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-100.png">
-      <PackagePath>www\images\BadgeLogo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-100.png">
+      <PackagePath>images\BadgeLogo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.721</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-125.png">
-      <PackagePath>www\images\BadgeLogo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-125.png">
+      <PackagePath>images\BadgeLogo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.757</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-150.png">
-      <PackagePath>www\images\BadgeLogo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-150.png">
+      <PackagePath>images\BadgeLogo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.792</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-200.png">
-      <PackagePath>www\images\BadgeLogo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-200.png">
+      <PackagePath>images\BadgeLogo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.823</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-400.png">
-      <PackagePath>www\images\BadgeLogo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-400.png">
+      <PackagePath>images\BadgeLogo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.865</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-100.png">
-      <PackagePath>www\images\LargeTile.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-100.png">
+      <PackagePath>images\LargeTile.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.721</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-125.png">
-      <PackagePath>www\images\LargeTile.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-125.png">
+      <PackagePath>images\LargeTile.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.756</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-150.png">
-      <PackagePath>www\images\LargeTile.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-150.png">
+      <PackagePath>images\LargeTile.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.796</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-200.png">
-      <PackagePath>www\images\LargeTile.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-200.png">
+      <PackagePath>images\LargeTile.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.834</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-400.png">
-      <PackagePath>www\images\LargeTile.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-400.png">
+      <PackagePath>images\LargeTile.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.903</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-100.png">
-      <PackagePath>www\images\SmallTile.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-100.png">
+      <PackagePath>images\SmallTile.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.239</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-125.png">
-      <PackagePath>www\images\SmallTile.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-125.png">
+      <PackagePath>images\SmallTile.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.266</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-150.png">
-      <PackagePath>www\images\SmallTile.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-150.png">
+      <PackagePath>images\SmallTile.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.296</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-200.png">
-      <PackagePath>www\images\SmallTile.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-200.png">
+      <PackagePath>images\SmallTile.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.326</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-400.png">
-      <PackagePath>www\images\SmallTile.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-400.png">
+      <PackagePath>images\SmallTile.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.360</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-100.png">
-      <PackagePath>www\images\splashscreen.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-100.png">
+      <PackagePath>images\splashscreen.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.327</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-125.png">
-      <PackagePath>www\images\splashscreen.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-125.png">
+      <PackagePath>images\splashscreen.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.368</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-150.png">
-      <PackagePath>www\images\splashscreen.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-150.png">
+      <PackagePath>images\splashscreen.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.432</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-200.png">
-      <PackagePath>www\images\splashscreen.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-200.png">
+      <PackagePath>images\splashscreen.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.514</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-400.png">
-      <PackagePath>www\images\splashscreen.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-400.png">
+      <PackagePath>images\splashscreen.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.676</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-100.png">
-      <PackagePath>www\images\Square150x150Logo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-100.png">
+      <PackagePath>images\Square150x150Logo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.387</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-125.png">
-      <PackagePath>www\images\Square150x150Logo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-125.png">
+      <PackagePath>images\Square150x150Logo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.418</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-150.png">
-      <PackagePath>www\images\Square150x150Logo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-150.png">
+      <PackagePath>images\Square150x150Logo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.449</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-200.png">
-      <PackagePath>www\images\Square150x150Logo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-200.png">
+      <PackagePath>images\Square150x150Logo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.479</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-400.png">
-      <PackagePath>www\images\Square150x150Logo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-400.png">
+      <PackagePath>images\Square150x150Logo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.525</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.altform-unplated_targetsize-16.png">
-      <PackagePath>www\images\Square44x44Logo.altform-unplated_targetsize-16.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.altform-unplated_targetsize-16.png">
+      <PackagePath>images\Square44x44Logo.altform-unplated_targetsize-16.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.183</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.altform-unplated_targetsize-256.png">
-      <PackagePath>www\images\Square44x44Logo.altform-unplated_targetsize-256.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.altform-unplated_targetsize-256.png">
+      <PackagePath>images\Square44x44Logo.altform-unplated_targetsize-256.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.293</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.altform-unplated_targetsize-32.png">
-      <PackagePath>www\images\Square44x44Logo.altform-unplated_targetsize-32.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.altform-unplated_targetsize-32.png">
+      <PackagePath>images\Square44x44Logo.altform-unplated_targetsize-32.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.234</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.altform-unplated_targetsize-48.png">
-      <PackagePath>www\images\Square44x44Logo.altform-unplated_targetsize-48.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.altform-unplated_targetsize-48.png">
+      <PackagePath>images\Square44x44Logo.altform-unplated_targetsize-48.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.260</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-100.png">
-      <PackagePath>www\images\Square44x44Logo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-100.png">
+      <PackagePath>images\Square44x44Logo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.928</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-125.png">
-      <PackagePath>www\images\Square44x44Logo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-125.png">
+      <PackagePath>images\Square44x44Logo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.953</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-150.png">
-      <PackagePath>www\images\Square44x44Logo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-150.png">
+      <PackagePath>images\Square44x44Logo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.977</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-200.png">
-      <PackagePath>www\images\Square44x44Logo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-200.png">
+      <PackagePath>images\Square44x44Logo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.002</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-400.png">
-      <PackagePath>www\images\Square44x44Logo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-400.png">
+      <PackagePath>images\Square44x44Logo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.029</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-16.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-16.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-16.png">
+      <PackagePath>images\Square44x44Logo.targetsize-16.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.054</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-24.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-24.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-24.png">
+      <PackagePath>images\Square44x44Logo.targetsize-24.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.078</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-24_altform-unplated.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-24_altform-unplated.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-24_altform-unplated.png">
+      <PackagePath>images\Square44x44Logo.targetsize-24_altform-unplated.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.210</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-256.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-256.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-256.png">
+      <PackagePath>images\Square44x44Logo.targetsize-256.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.157</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-32.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-32.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-32.png">
+      <PackagePath>images\Square44x44Logo.targetsize-32.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.103</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-48.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-48.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-48.png">
+      <PackagePath>images\Square44x44Logo.targetsize-48.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.128</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-100.png">
-      <PackagePath>www\images\storelogo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-100.png">
+      <PackagePath>images\storelogo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.894</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-125.png">
-      <PackagePath>www\images\storelogo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-125.png">
+      <PackagePath>images\storelogo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.922</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-150.png">
-      <PackagePath>www\images\storelogo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-150.png">
+      <PackagePath>images\storelogo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.950</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-200.png">
-      <PackagePath>www\images\storelogo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-200.png">
+      <PackagePath>images\storelogo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:38.979</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-400.png">
-      <PackagePath>www\images\storelogo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-400.png">
+      <PackagePath>images\storelogo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:39.015</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-100.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-100.png">
+      <PackagePath>images\Wide310x150Logo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.553</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-125.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-125.png">
+      <PackagePath>images\Wide310x150Logo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.580</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-150.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-150.png">
+      <PackagePath>images\Wide310x150Logo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.609</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-200.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-200.png">
+      <PackagePath>images\Wide310x150Logo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.642</Modified>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-400.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-400.png">
+      <PackagePath>images\Wide310x150Logo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
       <Modified>2017-06-12T06:29:37.690</Modified>
     </AppxPackagedFile>
@@ -454,6 +406,54 @@
       <PackagePath>www\img\Kiwix_icon_transparent_620x300.png</PackagePath>
       <Modified>2017-06-11T19:20:37.809</Modified>
     </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\A\dummyArticle.html">
+      <PackagePath>www\A\dummyArticle.html</PackagePath>
+      <Modified>2017-06-14T06:42:47.009</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\index.html">
+      <PackagePath>www\index.html</PackagePath>
+      <Modified>2017-06-14T11:40:07.161</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\app.css">
+      <PackagePath>www\css\app.css</PackagePath>
+      <Modified>2017-06-14T06:43:49.206</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap-theme.css">
+      <PackagePath>www\css\bootstrap-theme.css</PackagePath>
+      <Modified>2017-06-14T06:44:32.558</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap.css">
+      <PackagePath>www\css\bootstrap.css</PackagePath>
+      <Modified>2017-06-14T06:45:08.948</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\default.css">
+      <PackagePath>www\css\default.css</PackagePath>
+      <Modified>2017-06-12T05:33:43.335</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\favicon.ico">
+      <PackagePath>www\favicon.ico</PackagePath>
+      <Modified>2017-06-07T06:55:52.661</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.eot">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.eot</PackagePath>
+      <Modified>2017-06-07T06:55:52.827</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.svg">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.svg</PackagePath>
+      <Modified>2017-06-07T06:55:52.853</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.ttf">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.ttf</PackagePath>
+      <Modified>2017-06-07T06:55:52.880</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.woff">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.woff</PackagePath>
+      <Modified>2017-06-07T06:55:52.901</Modified>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.woff2">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.woff2</PackagePath>
+      <Modified>2017-06-07T06:55:52.922</Modified>
+    </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\img\spinner.gif">
       <PackagePath>www\img\spinner.gif</PackagePath>
       <Modified>2017-06-07T06:55:52.951</Modified>
@@ -529,7 +529,7 @@
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\ReverseMap\resources.pri">
       <PackagePath>resources.pri</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
-      <Modified>2017-06-14T21:24:51.651</Modified>
+      <Modified>2017-06-14T21:36:06.265</Modified>
     </AppxPackagedFile>
   </ItemGroup>
   <ItemGroup>
diff --git a/bin/Debug/AppxManifest.xml b/bin/Debug/AppxManifest.xml
index 293ad6d8..ad3510d2 100644
--- a/bin/Debug/AppxManifest.xml
+++ b/bin/Debug/AppxManifest.xml
@@ -12,7 +12,7 @@
   <Properties>
     <DisplayName>Kiwix JS</DisplayName>
     <PublisherDisplayName>Peribanu</PublisherDisplayName>
-    <Logo>www\images\storelogo.png</Logo>
+    <Logo>images\storelogo.png</Logo>
   </Properties>
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10240.0" MaxVersionTested="10.0.15063.0" />
@@ -25,16 +25,16 @@
       <uap:ApplicationContentUriRules>
         <uap:Rule Match="ms-appx-web:///www/index.html" Type="include" WindowsRuntimeAccess="none" />
       </uap:ApplicationContentUriRules>
-      <uap:VisualElements DisplayName="Kiwix JS" Description="Kiwix Offline Wikipedia and ZIM File Reader" BackgroundColor="transparent" Square150x150Logo="www\images\Square150x150Logo.png" Square44x44Logo="www\images\Square44x44Logo.png">
-        <uap:DefaultTile ShortName="Kiwix JS" Square310x310Logo="www\images\LargeTile.png" Wide310x150Logo="www\images\Wide310x150Logo.png" Square71x71Logo="www\images\SmallTile.png">
+      <uap:VisualElements DisplayName="Kiwix JS" Description="Kiwix Offline Wikipedia and ZIM File Reader" BackgroundColor="transparent" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
+        <uap:DefaultTile ShortName="Kiwix JS" Square310x310Logo="images\LargeTile.png" Wide310x150Logo="images\Wide310x150Logo.png" Square71x71Logo="images\SmallTile.png">
           <uap:ShowNameOnTiles>
             <uap:ShowOn Tile="square150x150Logo" />
             <uap:ShowOn Tile="wide310x150Logo" />
             <uap:ShowOn Tile="square310x310Logo" />
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
-        <uap:LockScreen Notification="badge" BadgeLogo="www\images\BadgeLogo.png" />
-        <uap:SplashScreen Image="www\images\splashscreen.png" BackgroundColor="transparent" />
+        <uap:LockScreen Notification="badge" BadgeLogo="images\BadgeLogo.png" />
+        <uap:SplashScreen Image="images\splashscreen.png" BackgroundColor="transparent" />
         <uap:InitialRotationPreference>
           <uap:Rotation Preference="portrait" />
           <uap:Rotation Preference="landscape" />
diff --git a/bin/Debug/KiwixWebApp.build.appxrecipe b/bin/Debug/KiwixWebApp.build.appxrecipe
index 53b40249..02f0aa98 100644
--- a/bin/Debug/KiwixWebApp.build.appxrecipe
+++ b/bin/Debug/KiwixWebApp.build.appxrecipe
@@ -25,240 +25,204 @@
     </AppXManifest>
   </ItemGroup>
   <ItemGroup>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\A\dummyArticle.html">
-      <PackagePath>www\A\dummyArticle.html</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\index.html">
-      <PackagePath>www\index.html</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\app.css">
-      <PackagePath>www\css\app.css</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap-theme.css">
-      <PackagePath>www\css\bootstrap-theme.css</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap.css">
-      <PackagePath>www\css\bootstrap.css</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\default.css">
-      <PackagePath>www\css\default.css</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\favicon.ico">
-      <PackagePath>www\favicon.ico</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.eot">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.eot</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.svg">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.svg</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.ttf">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.ttf</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.woff">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.woff</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.woff2">
-      <PackagePath>www\fonts\glyphicons-halflings-regular.woff2</PackagePath>
-    </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-100.png">
-      <PackagePath>www\images\BadgeLogo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-100.png">
+      <PackagePath>images\BadgeLogo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-125.png">
-      <PackagePath>www\images\BadgeLogo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-125.png">
+      <PackagePath>images\BadgeLogo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-150.png">
-      <PackagePath>www\images\BadgeLogo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-150.png">
+      <PackagePath>images\BadgeLogo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-200.png">
-      <PackagePath>www\images\BadgeLogo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-200.png">
+      <PackagePath>images\BadgeLogo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\BadgeLogo.scale-400.png">
-      <PackagePath>www\images\BadgeLogo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\BadgeLogo.scale-400.png">
+      <PackagePath>images\BadgeLogo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-100.png">
-      <PackagePath>www\images\LargeTile.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-100.png">
+      <PackagePath>images\LargeTile.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-125.png">
-      <PackagePath>www\images\LargeTile.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-125.png">
+      <PackagePath>images\LargeTile.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-150.png">
-      <PackagePath>www\images\LargeTile.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-150.png">
+      <PackagePath>images\LargeTile.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-200.png">
-      <PackagePath>www\images\LargeTile.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-200.png">
+      <PackagePath>images\LargeTile.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\LargeTile.scale-400.png">
-      <PackagePath>www\images\LargeTile.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\LargeTile.scale-400.png">
+      <PackagePath>images\LargeTile.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-100.png">
-      <PackagePath>www\images\SmallTile.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-100.png">
+      <PackagePath>images\SmallTile.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-125.png">
-      <PackagePath>www\images\SmallTile.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-125.png">
+      <PackagePath>images\SmallTile.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-150.png">
-      <PackagePath>www\images\SmallTile.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-150.png">
+      <PackagePath>images\SmallTile.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-200.png">
-      <PackagePath>www\images\SmallTile.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-200.png">
+      <PackagePath>images\SmallTile.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\SmallTile.scale-400.png">
-      <PackagePath>www\images\SmallTile.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\SmallTile.scale-400.png">
+      <PackagePath>images\SmallTile.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-100.png">
-      <PackagePath>www\images\splashscreen.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-100.png">
+      <PackagePath>images\splashscreen.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-125.png">
-      <PackagePath>www\images\splashscreen.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-125.png">
+      <PackagePath>images\splashscreen.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-150.png">
-      <PackagePath>www\images\splashscreen.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-150.png">
+      <PackagePath>images\splashscreen.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-200.png">
-      <PackagePath>www\images\splashscreen.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-200.png">
+      <PackagePath>images\splashscreen.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\splashscreen.scale-400.png">
-      <PackagePath>www\images\splashscreen.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\splashscreen.scale-400.png">
+      <PackagePath>images\splashscreen.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-100.png">
-      <PackagePath>www\images\Square150x150Logo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-100.png">
+      <PackagePath>images\Square150x150Logo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-125.png">
-      <PackagePath>www\images\Square150x150Logo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-125.png">
+      <PackagePath>images\Square150x150Logo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-150.png">
-      <PackagePath>www\images\Square150x150Logo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-150.png">
+      <PackagePath>images\Square150x150Logo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-200.png">
-      <PackagePath>www\images\Square150x150Logo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-200.png">
+      <PackagePath>images\Square150x150Logo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square150x150Logo.scale-400.png">
-      <PackagePath>www\images\Square150x150Logo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square150x150Logo.scale-400.png">
+      <PackagePath>images\Square150x150Logo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.altform-unplated_targetsize-16.png">
-      <PackagePath>www\images\Square44x44Logo.altform-unplated_targetsize-16.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.altform-unplated_targetsize-16.png">
+      <PackagePath>images\Square44x44Logo.altform-unplated_targetsize-16.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.altform-unplated_targetsize-256.png">
-      <PackagePath>www\images\Square44x44Logo.altform-unplated_targetsize-256.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.altform-unplated_targetsize-256.png">
+      <PackagePath>images\Square44x44Logo.altform-unplated_targetsize-256.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.altform-unplated_targetsize-32.png">
-      <PackagePath>www\images\Square44x44Logo.altform-unplated_targetsize-32.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.altform-unplated_targetsize-32.png">
+      <PackagePath>images\Square44x44Logo.altform-unplated_targetsize-32.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.altform-unplated_targetsize-48.png">
-      <PackagePath>www\images\Square44x44Logo.altform-unplated_targetsize-48.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.altform-unplated_targetsize-48.png">
+      <PackagePath>images\Square44x44Logo.altform-unplated_targetsize-48.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-100.png">
-      <PackagePath>www\images\Square44x44Logo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-100.png">
+      <PackagePath>images\Square44x44Logo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-125.png">
-      <PackagePath>www\images\Square44x44Logo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-125.png">
+      <PackagePath>images\Square44x44Logo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-150.png">
-      <PackagePath>www\images\Square44x44Logo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-150.png">
+      <PackagePath>images\Square44x44Logo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-200.png">
-      <PackagePath>www\images\Square44x44Logo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-200.png">
+      <PackagePath>images\Square44x44Logo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.scale-400.png">
-      <PackagePath>www\images\Square44x44Logo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.scale-400.png">
+      <PackagePath>images\Square44x44Logo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-16.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-16.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-16.png">
+      <PackagePath>images\Square44x44Logo.targetsize-16.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-24.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-24.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-24.png">
+      <PackagePath>images\Square44x44Logo.targetsize-24.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-24_altform-unplated.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-24_altform-unplated.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-24_altform-unplated.png">
+      <PackagePath>images\Square44x44Logo.targetsize-24_altform-unplated.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-256.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-256.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-256.png">
+      <PackagePath>images\Square44x44Logo.targetsize-256.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-32.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-32.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-32.png">
+      <PackagePath>images\Square44x44Logo.targetsize-32.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Square44x44Logo.targetsize-48.png">
-      <PackagePath>www\images\Square44x44Logo.targetsize-48.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Square44x44Logo.targetsize-48.png">
+      <PackagePath>images\Square44x44Logo.targetsize-48.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-100.png">
-      <PackagePath>www\images\storelogo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-100.png">
+      <PackagePath>images\storelogo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-125.png">
-      <PackagePath>www\images\storelogo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-125.png">
+      <PackagePath>images\storelogo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-150.png">
-      <PackagePath>www\images\storelogo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-150.png">
+      <PackagePath>images\storelogo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-200.png">
-      <PackagePath>www\images\storelogo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-200.png">
+      <PackagePath>images\storelogo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\storelogo.scale-400.png">
-      <PackagePath>www\images\storelogo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\storelogo.scale-400.png">
+      <PackagePath>images\storelogo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-100.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-100.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-100.png">
+      <PackagePath>images\Wide310x150Logo.scale-100.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-125.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-125.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-125.png">
+      <PackagePath>images\Wide310x150Logo.scale-125.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-150.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-150.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-150.png">
+      <PackagePath>images\Wide310x150Logo.scale-150.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-200.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-200.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-200.png">
+      <PackagePath>images\Wide310x150Logo.scale-200.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
-    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\images\Wide310x150Logo.scale-400.png">
-      <PackagePath>www\images\Wide310x150Logo.scale-400.png</PackagePath>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\images\Wide310x150Logo.scale-400.png">
+      <PackagePath>images\Wide310x150Logo.scale-400.png</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
     </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\img\icons\kiwix-120.png">
@@ -351,6 +315,42 @@
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\img\Kiwix_icon_transparent_620x300.png">
       <PackagePath>www\img\Kiwix_icon_transparent_620x300.png</PackagePath>
     </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\A\dummyArticle.html">
+      <PackagePath>www\A\dummyArticle.html</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\index.html">
+      <PackagePath>www\index.html</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\app.css">
+      <PackagePath>www\css\app.css</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap-theme.css">
+      <PackagePath>www\css\bootstrap-theme.css</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap.css">
+      <PackagePath>www\css\bootstrap.css</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\default.css">
+      <PackagePath>www\css\default.css</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\favicon.ico">
+      <PackagePath>www\favicon.ico</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.eot">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.eot</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.svg">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.svg</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.ttf">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.ttf</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.woff">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.woff</PackagePath>
+    </AppxPackagedFile>
+    <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\fonts\glyphicons-halflings-regular.woff2">
+      <PackagePath>www\fonts\glyphicons-halflings-regular.woff2</PackagePath>
+    </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\img\spinner.gif">
       <PackagePath>www\img\spinner.gif</PackagePath>
     </AppxPackagedFile>
diff --git a/bin/Debug/ReverseMap/resources.pri b/bin/Debug/ReverseMap/resources.pri
index cd5a2380..f6916b2a 100644
Binary files a/bin/Debug/ReverseMap/resources.pri and b/bin/Debug/ReverseMap/resources.pri differ
diff --git a/bld/Debug/layout.resfiles b/bld/Debug/layout.resfiles
index aec08213..d09a0625 100644
--- a/bld/Debug/layout.resfiles
+++ b/bld/Debug/layout.resfiles
@@ -1,3 +1,53 @@
+images\BadgeLogo.scale-100.png
+images\BadgeLogo.scale-125.png
+images\BadgeLogo.scale-150.png
+images\BadgeLogo.scale-200.png
+images\BadgeLogo.scale-400.png
+images\LargeTile.scale-100.png
+images\LargeTile.scale-125.png
+images\LargeTile.scale-150.png
+images\LargeTile.scale-200.png
+images\LargeTile.scale-400.png
+images\SmallTile.scale-100.png
+images\SmallTile.scale-125.png
+images\SmallTile.scale-150.png
+images\SmallTile.scale-200.png
+images\SmallTile.scale-400.png
+images\splashscreen.scale-100.png
+images\splashscreen.scale-125.png
+images\splashscreen.scale-150.png
+images\splashscreen.scale-200.png
+images\splashscreen.scale-400.png
+images\Square150x150Logo.scale-100.png
+images\Square150x150Logo.scale-125.png
+images\Square150x150Logo.scale-150.png
+images\Square150x150Logo.scale-200.png
+images\Square150x150Logo.scale-400.png
+images\Square44x44Logo.altform-unplated_targetsize-16.png
+images\Square44x44Logo.altform-unplated_targetsize-256.png
+images\Square44x44Logo.altform-unplated_targetsize-32.png
+images\Square44x44Logo.altform-unplated_targetsize-48.png
+images\Square44x44Logo.scale-100.png
+images\Square44x44Logo.scale-125.png
+images\Square44x44Logo.scale-150.png
+images\Square44x44Logo.scale-200.png
+images\Square44x44Logo.scale-400.png
+images\Square44x44Logo.targetsize-16.png
+images\Square44x44Logo.targetsize-24.png
+images\Square44x44Logo.targetsize-24_altform-unplated.png
+images\Square44x44Logo.targetsize-256.png
+images\Square44x44Logo.targetsize-32.png
+images\Square44x44Logo.targetsize-48.png
+images\storelogo.scale-100.png
+images\storelogo.scale-125.png
+images\storelogo.scale-150.png
+images\storelogo.scale-200.png
+images\storelogo.scale-400.png
+images\Wide310x150Logo.scale-100.png
+images\Wide310x150Logo.scale-125.png
+images\Wide310x150Logo.scale-150.png
+images\Wide310x150Logo.scale-200.png
+images\Wide310x150Logo.scale-400.png
 www\A\dummyArticle.html
 www\css\app.css
 www\css\bootstrap.css
@@ -9,56 +59,6 @@ www\fonts\glyphicons-halflings-regular.svg
 www\fonts\glyphicons-halflings-regular.ttf
 www\fonts\glyphicons-halflings-regular.woff
 www\fonts\glyphicons-halflings-regular.woff2
-www\images\BadgeLogo.scale-100.png
-www\images\BadgeLogo.scale-125.png
-www\images\BadgeLogo.scale-150.png
-www\images\BadgeLogo.scale-200.png
-www\images\BadgeLogo.scale-400.png
-www\images\LargeTile.scale-100.png
-www\images\LargeTile.scale-125.png
-www\images\LargeTile.scale-150.png
-www\images\LargeTile.scale-200.png
-www\images\LargeTile.scale-400.png
-www\images\SmallTile.scale-100.png
-www\images\SmallTile.scale-125.png
-www\images\SmallTile.scale-150.png
-www\images\SmallTile.scale-200.png
-www\images\SmallTile.scale-400.png
-www\images\splashscreen.scale-100.png
-www\images\splashscreen.scale-125.png
-www\images\splashscreen.scale-150.png
-www\images\splashscreen.scale-200.png
-www\images\splashscreen.scale-400.png
-www\images\Square150x150Logo.scale-100.png
-www\images\Square150x150Logo.scale-125.png
-www\images\Square150x150Logo.scale-150.png
-www\images\Square150x150Logo.scale-200.png
-www\images\Square150x150Logo.scale-400.png
-www\images\Square44x44Logo.altform-unplated_targetsize-16.png
-www\images\Square44x44Logo.altform-unplated_targetsize-256.png
-www\images\Square44x44Logo.altform-unplated_targetsize-32.png
-www\images\Square44x44Logo.altform-unplated_targetsize-48.png
-www\images\Square44x44Logo.scale-100.png
-www\images\Square44x44Logo.scale-125.png
-www\images\Square44x44Logo.scale-150.png
-www\images\Square44x44Logo.scale-200.png
-www\images\Square44x44Logo.scale-400.png
-www\images\Square44x44Logo.targetsize-16.png
-www\images\Square44x44Logo.targetsize-24.png
-www\images\Square44x44Logo.targetsize-24_altform-unplated.png
-www\images\Square44x44Logo.targetsize-256.png
-www\images\Square44x44Logo.targetsize-32.png
-www\images\Square44x44Logo.targetsize-48.png
-www\images\storelogo.scale-100.png
-www\images\storelogo.scale-125.png
-www\images\storelogo.scale-150.png
-www\images\storelogo.scale-200.png
-www\images\storelogo.scale-400.png
-www\images\Wide310x150Logo.scale-100.png
-www\images\Wide310x150Logo.scale-125.png
-www\images\Wide310x150Logo.scale-150.png
-www\images\Wide310x150Logo.scale-200.png
-www\images\Wide310x150Logo.scale-400.png
 www\img\icons\kiwix-120.png
 www\img\icons\kiwix-1240.png
 www\img\icons\kiwix-128.png
diff --git a/bld/Debug/layout.resfiles.intermediate b/bld/Debug/layout.resfiles.intermediate
index aec08213..d09a0625 100644
--- a/bld/Debug/layout.resfiles.intermediate
+++ b/bld/Debug/layout.resfiles.intermediate
@@ -1,3 +1,53 @@
+images\BadgeLogo.scale-100.png
+images\BadgeLogo.scale-125.png
+images\BadgeLogo.scale-150.png
+images\BadgeLogo.scale-200.png
+images\BadgeLogo.scale-400.png
+images\LargeTile.scale-100.png
+images\LargeTile.scale-125.png
+images\LargeTile.scale-150.png
+images\LargeTile.scale-200.png
+images\LargeTile.scale-400.png
+images\SmallTile.scale-100.png
+images\SmallTile.scale-125.png
+images\SmallTile.scale-150.png
+images\SmallTile.scale-200.png
+images\SmallTile.scale-400.png
+images\splashscreen.scale-100.png
+images\splashscreen.scale-125.png
+images\splashscreen.scale-150.png
+images\splashscreen.scale-200.png
+images\splashscreen.scale-400.png
+images\Square150x150Logo.scale-100.png
+images\Square150x150Logo.scale-125.png
+images\Square150x150Logo.scale-150.png
+images\Square150x150Logo.scale-200.png
+images\Square150x150Logo.scale-400.png
+images\Square44x44Logo.altform-unplated_targetsize-16.png
+images\Square44x44Logo.altform-unplated_targetsize-256.png
+images\Square44x44Logo.altform-unplated_targetsize-32.png
+images\Square44x44Logo.altform-unplated_targetsize-48.png
+images\Square44x44Logo.scale-100.png
+images\Square44x44Logo.scale-125.png
+images\Square44x44Logo.scale-150.png
+images\Square44x44Logo.scale-200.png
+images\Square44x44Logo.scale-400.png
+images\Square44x44Logo.targetsize-16.png
+images\Square44x44Logo.targetsize-24.png
+images\Square44x44Logo.targetsize-24_altform-unplated.png
+images\Square44x44Logo.targetsize-256.png
+images\Square44x44Logo.targetsize-32.png
+images\Square44x44Logo.targetsize-48.png
+images\storelogo.scale-100.png
+images\storelogo.scale-125.png
+images\storelogo.scale-150.png
+images\storelogo.scale-200.png
+images\storelogo.scale-400.png
+images\Wide310x150Logo.scale-100.png
+images\Wide310x150Logo.scale-125.png
+images\Wide310x150Logo.scale-150.png
+images\Wide310x150Logo.scale-200.png
+images\Wide310x150Logo.scale-400.png
 www\A\dummyArticle.html
 www\css\app.css
 www\css\bootstrap.css
@@ -9,56 +59,6 @@ www\fonts\glyphicons-halflings-regular.svg
 www\fonts\glyphicons-halflings-regular.ttf
 www\fonts\glyphicons-halflings-regular.woff
 www\fonts\glyphicons-halflings-regular.woff2
-www\images\BadgeLogo.scale-100.png
-www\images\BadgeLogo.scale-125.png
-www\images\BadgeLogo.scale-150.png
-www\images\BadgeLogo.scale-200.png
-www\images\BadgeLogo.scale-400.png
-www\images\LargeTile.scale-100.png
-www\images\LargeTile.scale-125.png
-www\images\LargeTile.scale-150.png
-www\images\LargeTile.scale-200.png
-www\images\LargeTile.scale-400.png
-www\images\SmallTile.scale-100.png
-www\images\SmallTile.scale-125.png
-www\images\SmallTile.scale-150.png
-www\images\SmallTile.scale-200.png
-www\images\SmallTile.scale-400.png
-www\images\splashscreen.scale-100.png
-www\images\splashscreen.scale-125.png
-www\images\splashscreen.scale-150.png
-www\images\splashscreen.scale-200.png
-www\images\splashscreen.scale-400.png
-www\images\Square150x150Logo.scale-100.png
-www\images\Square150x150Logo.scale-125.png
-www\images\Square150x150Logo.scale-150.png
-www\images\Square150x150Logo.scale-200.png
-www\images\Square150x150Logo.scale-400.png
-www\images\Square44x44Logo.altform-unplated_targetsize-16.png
-www\images\Square44x44Logo.altform-unplated_targetsize-256.png
-www\images\Square44x44Logo.altform-unplated_targetsize-32.png
-www\images\Square44x44Logo.altform-unplated_targetsize-48.png
-www\images\Square44x44Logo.scale-100.png
-www\images\Square44x44Logo.scale-125.png
-www\images\Square44x44Logo.scale-150.png
-www\images\Square44x44Logo.scale-200.png
-www\images\Square44x44Logo.scale-400.png
-www\images\Square44x44Logo.targetsize-16.png
-www\images\Square44x44Logo.targetsize-24.png
-www\images\Square44x44Logo.targetsize-24_altform-unplated.png
-www\images\Square44x44Logo.targetsize-256.png
-www\images\Square44x44Logo.targetsize-32.png
-www\images\Square44x44Logo.targetsize-48.png
-www\images\storelogo.scale-100.png
-www\images\storelogo.scale-125.png
-www\images\storelogo.scale-150.png
-www\images\storelogo.scale-200.png
-www\images\storelogo.scale-400.png
-www\images\Wide310x150Logo.scale-100.png
-www\images\Wide310x150Logo.scale-125.png
-www\images\Wide310x150Logo.scale-150.png
-www\images\Wide310x150Logo.scale-200.png
-www\images\Wide310x150Logo.scale-400.png
 www\img\icons\kiwix-120.png
 www\img\icons\kiwix-1240.png
 www\img\icons\kiwix-128.png
diff --git a/www/images/BadgeLogo.scale-100.png b/images/BadgeLogo.scale-100.png
similarity index 100%
rename from www/images/BadgeLogo.scale-100.png
rename to images/BadgeLogo.scale-100.png
diff --git a/www/images/BadgeLogo.scale-125.png b/images/BadgeLogo.scale-125.png
similarity index 100%
rename from www/images/BadgeLogo.scale-125.png
rename to images/BadgeLogo.scale-125.png
diff --git a/www/images/BadgeLogo.scale-150.png b/images/BadgeLogo.scale-150.png
similarity index 100%
rename from www/images/BadgeLogo.scale-150.png
rename to images/BadgeLogo.scale-150.png
diff --git a/www/images/BadgeLogo.scale-200.png b/images/BadgeLogo.scale-200.png
similarity index 100%
rename from www/images/BadgeLogo.scale-200.png
rename to images/BadgeLogo.scale-200.png
diff --git a/www/images/BadgeLogo.scale-400.png b/images/BadgeLogo.scale-400.png
similarity index 100%
rename from www/images/BadgeLogo.scale-400.png
rename to images/BadgeLogo.scale-400.png
diff --git a/www/images/LargeTile.scale-100.png b/images/LargeTile.scale-100.png
similarity index 100%
rename from www/images/LargeTile.scale-100.png
rename to images/LargeTile.scale-100.png
diff --git a/www/images/LargeTile.scale-125.png b/images/LargeTile.scale-125.png
similarity index 100%
rename from www/images/LargeTile.scale-125.png
rename to images/LargeTile.scale-125.png
diff --git a/www/images/LargeTile.scale-150.png b/images/LargeTile.scale-150.png
similarity index 100%
rename from www/images/LargeTile.scale-150.png
rename to images/LargeTile.scale-150.png
diff --git a/www/images/LargeTile.scale-200.png b/images/LargeTile.scale-200.png
similarity index 100%
rename from www/images/LargeTile.scale-200.png
rename to images/LargeTile.scale-200.png
diff --git a/www/images/LargeTile.scale-400.png b/images/LargeTile.scale-400.png
similarity index 100%
rename from www/images/LargeTile.scale-400.png
rename to images/LargeTile.scale-400.png
diff --git a/www/images/SmallTile.scale-100.png b/images/SmallTile.scale-100.png
similarity index 100%
rename from www/images/SmallTile.scale-100.png
rename to images/SmallTile.scale-100.png
diff --git a/www/images/SmallTile.scale-125.png b/images/SmallTile.scale-125.png
similarity index 100%
rename from www/images/SmallTile.scale-125.png
rename to images/SmallTile.scale-125.png
diff --git a/www/images/SmallTile.scale-150.png b/images/SmallTile.scale-150.png
similarity index 100%
rename from www/images/SmallTile.scale-150.png
rename to images/SmallTile.scale-150.png
diff --git a/www/images/SmallTile.scale-200.png b/images/SmallTile.scale-200.png
similarity index 100%
rename from www/images/SmallTile.scale-200.png
rename to images/SmallTile.scale-200.png
diff --git a/www/images/SmallTile.scale-400.png b/images/SmallTile.scale-400.png
similarity index 100%
rename from www/images/SmallTile.scale-400.png
rename to images/SmallTile.scale-400.png
diff --git a/www/images/Square150x150Logo.scale-100.png b/images/Square150x150Logo.scale-100.png
similarity index 100%
rename from www/images/Square150x150Logo.scale-100.png
rename to images/Square150x150Logo.scale-100.png
diff --git a/www/images/Square150x150Logo.scale-125.png b/images/Square150x150Logo.scale-125.png
similarity index 100%
rename from www/images/Square150x150Logo.scale-125.png
rename to images/Square150x150Logo.scale-125.png
diff --git a/www/images/Square150x150Logo.scale-150.png b/images/Square150x150Logo.scale-150.png
similarity index 100%
rename from www/images/Square150x150Logo.scale-150.png
rename to images/Square150x150Logo.scale-150.png
diff --git a/www/images/Square150x150Logo.scale-200.png b/images/Square150x150Logo.scale-200.png
similarity index 100%
rename from www/images/Square150x150Logo.scale-200.png
rename to images/Square150x150Logo.scale-200.png
diff --git a/www/images/Square150x150Logo.scale-400.png b/images/Square150x150Logo.scale-400.png
similarity index 100%
rename from www/images/Square150x150Logo.scale-400.png
rename to images/Square150x150Logo.scale-400.png
diff --git a/www/images/Square44x44Logo.altform-unplated_targetsize-16.png b/images/Square44x44Logo.altform-unplated_targetsize-16.png
similarity index 100%
rename from www/images/Square44x44Logo.altform-unplated_targetsize-16.png
rename to images/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/www/images/Square44x44Logo.altform-unplated_targetsize-256.png b/images/Square44x44Logo.altform-unplated_targetsize-256.png
similarity index 100%
rename from www/images/Square44x44Logo.altform-unplated_targetsize-256.png
rename to images/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/www/images/Square44x44Logo.altform-unplated_targetsize-32.png b/images/Square44x44Logo.altform-unplated_targetsize-32.png
similarity index 100%
rename from www/images/Square44x44Logo.altform-unplated_targetsize-32.png
rename to images/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/www/images/Square44x44Logo.altform-unplated_targetsize-48.png b/images/Square44x44Logo.altform-unplated_targetsize-48.png
similarity index 100%
rename from www/images/Square44x44Logo.altform-unplated_targetsize-48.png
rename to images/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/www/images/Square44x44Logo.scale-100.png b/images/Square44x44Logo.scale-100.png
similarity index 100%
rename from www/images/Square44x44Logo.scale-100.png
rename to images/Square44x44Logo.scale-100.png
diff --git a/www/images/Square44x44Logo.scale-125.png b/images/Square44x44Logo.scale-125.png
similarity index 100%
rename from www/images/Square44x44Logo.scale-125.png
rename to images/Square44x44Logo.scale-125.png
diff --git a/www/images/Square44x44Logo.scale-150.png b/images/Square44x44Logo.scale-150.png
similarity index 100%
rename from www/images/Square44x44Logo.scale-150.png
rename to images/Square44x44Logo.scale-150.png
diff --git a/www/images/Square44x44Logo.scale-200.png b/images/Square44x44Logo.scale-200.png
similarity index 100%
rename from www/images/Square44x44Logo.scale-200.png
rename to images/Square44x44Logo.scale-200.png
diff --git a/www/images/Square44x44Logo.scale-400.png b/images/Square44x44Logo.scale-400.png
similarity index 100%
rename from www/images/Square44x44Logo.scale-400.png
rename to images/Square44x44Logo.scale-400.png
diff --git a/www/images/Square44x44Logo.targetsize-16.png b/images/Square44x44Logo.targetsize-16.png
similarity index 100%
rename from www/images/Square44x44Logo.targetsize-16.png
rename to images/Square44x44Logo.targetsize-16.png
diff --git a/www/images/Square44x44Logo.targetsize-24.png b/images/Square44x44Logo.targetsize-24.png
similarity index 100%
rename from www/images/Square44x44Logo.targetsize-24.png
rename to images/Square44x44Logo.targetsize-24.png
diff --git a/www/images/Square44x44Logo.targetsize-24_altform-unplated.png b/images/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from www/images/Square44x44Logo.targetsize-24_altform-unplated.png
rename to images/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/www/images/Square44x44Logo.targetsize-256.png b/images/Square44x44Logo.targetsize-256.png
similarity index 100%
rename from www/images/Square44x44Logo.targetsize-256.png
rename to images/Square44x44Logo.targetsize-256.png
diff --git a/www/images/Square44x44Logo.targetsize-32.png b/images/Square44x44Logo.targetsize-32.png
similarity index 100%
rename from www/images/Square44x44Logo.targetsize-32.png
rename to images/Square44x44Logo.targetsize-32.png
diff --git a/www/images/Square44x44Logo.targetsize-48.png b/images/Square44x44Logo.targetsize-48.png
similarity index 100%
rename from www/images/Square44x44Logo.targetsize-48.png
rename to images/Square44x44Logo.targetsize-48.png
diff --git a/www/images/Wide310x150Logo.scale-100.png b/images/Wide310x150Logo.scale-100.png
similarity index 100%
rename from www/images/Wide310x150Logo.scale-100.png
rename to images/Wide310x150Logo.scale-100.png
diff --git a/www/images/Wide310x150Logo.scale-125.png b/images/Wide310x150Logo.scale-125.png
similarity index 100%
rename from www/images/Wide310x150Logo.scale-125.png
rename to images/Wide310x150Logo.scale-125.png
diff --git a/www/images/Wide310x150Logo.scale-150.png b/images/Wide310x150Logo.scale-150.png
similarity index 100%
rename from www/images/Wide310x150Logo.scale-150.png
rename to images/Wide310x150Logo.scale-150.png
diff --git a/www/images/Wide310x150Logo.scale-200.png b/images/Wide310x150Logo.scale-200.png
similarity index 100%
rename from www/images/Wide310x150Logo.scale-200.png
rename to images/Wide310x150Logo.scale-200.png
diff --git a/www/images/Wide310x150Logo.scale-400.png b/images/Wide310x150Logo.scale-400.png
similarity index 100%
rename from www/images/Wide310x150Logo.scale-400.png
rename to images/Wide310x150Logo.scale-400.png
diff --git a/www/images/splashscreen.scale-100.png b/images/splashscreen.scale-100.png
similarity index 100%
rename from www/images/splashscreen.scale-100.png
rename to images/splashscreen.scale-100.png
diff --git a/www/images/splashscreen.scale-125.png b/images/splashscreen.scale-125.png
similarity index 100%
rename from www/images/splashscreen.scale-125.png
rename to images/splashscreen.scale-125.png
diff --git a/www/images/splashscreen.scale-150.png b/images/splashscreen.scale-150.png
similarity index 100%
rename from www/images/splashscreen.scale-150.png
rename to images/splashscreen.scale-150.png
diff --git a/www/images/splashscreen.scale-200.png b/images/splashscreen.scale-200.png
similarity index 100%
rename from www/images/splashscreen.scale-200.png
rename to images/splashscreen.scale-200.png
diff --git a/www/images/splashscreen.scale-400.png b/images/splashscreen.scale-400.png
similarity index 100%
rename from www/images/splashscreen.scale-400.png
rename to images/splashscreen.scale-400.png
diff --git a/www/images/storelogo.scale-100.png b/images/storelogo.scale-100.png
similarity index 100%
rename from www/images/storelogo.scale-100.png
rename to images/storelogo.scale-100.png
diff --git a/www/images/storelogo.scale-125.png b/images/storelogo.scale-125.png
similarity index 100%
rename from www/images/storelogo.scale-125.png
rename to images/storelogo.scale-125.png
diff --git a/www/images/storelogo.scale-150.png b/images/storelogo.scale-150.png
similarity index 100%
rename from www/images/storelogo.scale-150.png
rename to images/storelogo.scale-150.png
diff --git a/www/images/storelogo.scale-200.png b/images/storelogo.scale-200.png
similarity index 100%
rename from www/images/storelogo.scale-200.png
rename to images/storelogo.scale-200.png
diff --git a/www/images/storelogo.scale-400.png b/images/storelogo.scale-400.png
similarity index 100%
rename from www/images/storelogo.scale-400.png
rename to images/storelogo.scale-400.png
diff --git a/package.appxmanifest b/package.appxmanifest
index d8643d2a..9d43e201 100644
--- a/package.appxmanifest
+++ b/package.appxmanifest
@@ -5,7 +5,7 @@
   <Properties>
     <DisplayName>Kiwix JS</DisplayName>
     <PublisherDisplayName>Peribanu</PublisherDisplayName>
-    <Logo>www\images\storelogo.png</Logo>
+    <Logo>images\storelogo.png</Logo>
   </Properties>
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
@@ -18,16 +18,16 @@
       <uap:ApplicationContentUriRules>
         <uap:Rule Match="ms-appx-web:///www/index.html" Type="include" WindowsRuntimeAccess="none" />
       </uap:ApplicationContentUriRules>
-      <uap:VisualElements DisplayName="Kiwix JS" Description="Kiwix Offline Wikipedia and ZIM File Reader" BackgroundColor="transparent" Square150x150Logo="www\images\Square150x150Logo.png" Square44x44Logo="www\images\Square44x44Logo.png">
-        <uap:DefaultTile ShortName="Kiwix JS" Square310x310Logo="www\images\LargeTile.png" Wide310x150Logo="www\images\Wide310x150Logo.png" Square71x71Logo="www\images\SmallTile.png">
+      <uap:VisualElements DisplayName="Kiwix JS" Description="Kiwix Offline Wikipedia and ZIM File Reader" BackgroundColor="transparent" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
+        <uap:DefaultTile ShortName="Kiwix JS" Square310x310Logo="images\LargeTile.png" Wide310x150Logo="images\Wide310x150Logo.png" Square71x71Logo="images\SmallTile.png">
           <uap:ShowNameOnTiles>
             <uap:ShowOn Tile="square150x150Logo" />
             <uap:ShowOn Tile="wide310x150Logo" />
             <uap:ShowOn Tile="square310x310Logo" />
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
-        <uap:LockScreen Notification="badge" BadgeLogo="www\images\BadgeLogo.png" />
-        <uap:SplashScreen Image="www\images\splashscreen.png" BackgroundColor="transparent" />
+        <uap:LockScreen Notification="badge" BadgeLogo="images\BadgeLogo.png" />
+        <uap:SplashScreen Image="images\splashscreen.png" BackgroundColor="transparent" />
         <uap:InitialRotationPreference>
           <uap:Rotation Preference="portrait" />
           <uap:Rotation Preference="landscape" />