Version 1.7 - only difference with 1.6 is Argon2Kdf fully working

Status text and password box border colors are updated according to database status
Update composite key in Settings work
Some code cleanup

.gitignore

@@ -33,4 +33,9 @@ _ReSharper*/
 Translation/TrlUtil.vshost.exe.manifest
 *.nupkg
 .vs/
-/UpgradeLog.htm
+/UpgradeLog*.htm
+packages/
+project.lock.json
+AppPackages/
+BundleArtifacts/
+*.DotSettings

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

ModernKeePass.sln

@@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePass", "ModernKeePass\ModernKeePass.csproj", "{A0CFC681-769B-405A-8482-0CDEE595A91F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassApp", "ModernKeePass\ModernKeePassApp.csproj", "{A0CFC681-769B-405A-8482-0CDEE595A91F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib", "ModernKeePassLib\ModernKeePassLib.csproj", "{A207789D-9020-401B-9D0A-D0D2CFF721BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib", "ModernKeePassLib\ModernKeePassLib.csproj", "{2E710089-9559-4967-846C-E763DD1F3ACB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib.Test", "ModernKeePassLib.Test\ModernKeePassLib.Test.csproj", "{0A4279CF-2A67-4868-9906-052E50C25F3B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,22 +45,46 @@ Global
 		{A0CFC681-769B-405A-8482-0CDEE595A91F}.Release|x86.ActiveCfg = Release|x86
 		{A0CFC681-769B-405A-8482-0CDEE595A91F}.Release|x86.Build.0 = Release|x86
 		{A0CFC681-769B-405A-8482-0CDEE595A91F}.Release|x86.Deploy.0 = Release|x86
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Debug|ARM.ActiveCfg = Debug|ARM
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Debug|ARM.Build.0 = Debug|ARM
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Debug|x64.ActiveCfg = Debug|x64
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Debug|x64.Build.0 = Debug|x64
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Debug|x86.ActiveCfg = Debug|x86
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Debug|x86.Build.0 = Debug|x86
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Release|ARM.ActiveCfg = Release|ARM
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Release|ARM.Build.0 = Release|ARM
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Release|x64.ActiveCfg = Release|x64
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Release|x64.Build.0 = Release|x64
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Release|x86.ActiveCfg = Release|x86
-		{A207789D-9020-401B-9D0A-D0D2CFF721BD}.Release|x86.Build.0 = Release|x86
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Debug|ARM.Build.0 = Debug|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Debug|x64.Build.0 = Debug|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Debug|x86.Build.0 = Debug|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Release|ARM.Build.0 = Release|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Release|x64.ActiveCfg = Release|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Release|x64.Build.0 = Release|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E710089-9559-4967-846C-E763DD1F3ACB}.Release|x86.Build.0 = Release|Any CPU
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|ARM.Build.0 = Debug|ARM
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|ARM.Deploy.0 = Debug|ARM
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|x64.ActiveCfg = Debug|x64
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|x64.Build.0 = Debug|x64
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|x64.Deploy.0 = Debug|x64
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|x86.ActiveCfg = Debug|x86
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|x86.Build.0 = Debug|x86
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Debug|x86.Deploy.0 = Debug|x86
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|ARM.ActiveCfg = Release|ARM
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|ARM.Build.0 = Release|ARM
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|ARM.Deploy.0 = Release|ARM
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|x64.ActiveCfg = Release|x64
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|x64.Build.0 = Release|x64
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|x64.Deploy.0 = Release|x64
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|x86.ActiveCfg = Release|x86
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|x86.Build.0 = Release|x86
+		{0A4279CF-2A67-4868-9906-052E50C25F3B}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ModernKeePass/.gitignore

@@ -34,3 +34,4 @@ Translation/TrlUtil.vshost.exe.manifest
 *.nupkg
 .vs/
 /UpgradeLog.htm
+ModernKeePass_StoreKey.pfx

ModernKeePass/Actions/ClipboardAction.cs

@@ -0,0 +1,26 @@
+using Windows.ApplicationModel.DataTransfer;
+using Windows.UI.Xaml;
+using Microsoft.Xaml.Interactivity;
+
+namespace ModernKeePass.Actions
+{
+    public class ClipboardAction : DependencyObject, IAction
+    {
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        public static readonly DependencyProperty TextProperty =
+            DependencyProperty.Register("Text", typeof(string), typeof(ClipboardAction), new PropertyMetadata(string.Empty));
+
+        public object Execute(object sender, object parameter)
+        {
+            var dataPackage = new DataPackage { RequestedOperation = DataPackageOperation.Copy };
+            dataPackage.SetText(Text);
+            Clipboard.SetContent(dataPackage);
+            return null;
+        }
+    }
+}

ModernKeePass/Actions/SetupFocusAction.cs

@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Microsoft.Xaml.Interactivity;
+
+namespace ModernKeePass.Actions
+{
+    public class SetupFocusAction : DependencyObject, IAction
+    {
+        public Control TargetObject
+        {
+            get { return (Control)GetValue(TargetObjectProperty); }
+            set { SetValue(TargetObjectProperty, value); }
+        }
+
+        public static readonly DependencyProperty TargetObjectProperty =
+            DependencyProperty.Register("TargetObject", typeof(Control), typeof(SetupFocusAction), new PropertyMetadata(null));
+
+        public object Execute(object sender, object parameter)
+        {
+            return Task.Factory.StartNew(
+                () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+                    () => TargetObject?.Focus(FocusState.Programmatic)));
+        }
+    }
+}

ModernKeePass/App.xaml

@@ -2,6 +2,16 @@
     x:Class="ModernKeePass.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ModernKeePass">
+    RequestedTheme="Light">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Styles/TextBoxWithButtonStyle.xaml" />
+                <ResourceDictionary Source="Styles/HamburgerButtonStyle.xaml" />
+                <ResourceDictionary Source="Styles/ListViewLeftIndicatorStyle.xaml" />
+                <ResourceDictionary Source="Styles/NoBorderButtonStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
 
 </Application>

ModernKeePass/App.xaml.cs

@@ -1,19 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
+using Windows.Data.Json;
+using Windows.Storage;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
+using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
 
 // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227
 
@@ -22,18 +17,21 @@ namespace ModernKeePass
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
     /// </summary>
-    sealed partial class App : Application
+    sealed partial class App
     {
+        public DatabaseHelper Database { get; set; } = new DatabaseHelper();
+
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
         /// executed, and as such is the logical equivalent of main() or WinMain().
         /// </summary>
         public App()
         {
-            this.InitializeComponent();
-            this.Suspending += OnSuspending;
+            InitializeComponent();
+            Suspending += OnSuspending;
         }
 
+        #region Event Handlers
         /// <summary>
         /// Invoked when the application is launched normally by the end user.  Other entry points
         /// will be used such as when the application is launched to open a specific file.
@@ -41,24 +39,33 @@ namespace ModernKeePass
         /// <param name="e">Details about the launch request and process.</param>
         protected override void OnLaunched(LaunchActivatedEventArgs e)
         {
+            OnLaunchOrActivated(e);
+        }
+
+        protected override void OnActivated(IActivatedEventArgs args)
+        {
+            OnLaunchOrActivated(args);
+        }
+
+        private void OnLaunchOrActivated(IActivatedEventArgs e)
+        {
 
 #if DEBUG
             if (System.Diagnostics.Debugger.IsAttached)
             {
-                this.DebugSettings.EnableFrameRateCounter = true;
+                //DebugSettings.EnableFrameRateCounter = true;
             }
 #endif
 
-            Frame rootFrame = Window.Current.Content as Frame;
+            var rootFrame = Window.Current.Content as Frame;
 
             // Do not repeat app initialization when the Window already has content,
             // just ensure that the window is active
             if (rootFrame == null)
             {
                 // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
+                rootFrame = new Frame {Language = Windows.Globalization.ApplicationLanguages.Languages[0]};
                 // Set the default language
-                rootFrame.Language = Windows.Globalization.ApplicationLanguages.Languages[0];
 
                 rootFrame.NavigationFailed += OnNavigationFailed;
 
@@ -71,13 +78,30 @@ namespace ModernKeePass
                 Window.Current.Content = rootFrame;
             }
 
-            if (rootFrame.Content == null)
+            if (e is LaunchActivatedEventArgs)
             {
-                // When the navigation stack isn't restored navigate to the first page,
-                // configuring the new page by passing required information as a navigation
-                // parameter
-                rootFrame.Navigate(typeof(MainPage), e.Arguments);
+                var lauchActivatedEventArgs = (LaunchActivatedEventArgs) e;
+                if (rootFrame.Content == null)
+                {
+                    // When the navigation stack isn't restored navigate to the first page,
+                    // configuring the new page by passing required information as a navigation
+                    // parameter
+                    rootFrame.Navigate(typeof(Pages.MainPage), lauchActivatedEventArgs.Arguments);
+                }
+                /*else
+                {
+                    // App is "launched" via the Toast Activation event
+                    UndoEntityDelete(lauchActivatedEventArgs.Arguments);
+                }*/
             }
+            // This is only available on Windows 10...
+            /*else if (e is ToastNotificationActivatedEventArgs)
+            {
+                var toastActivationArgs = e as ToastNotificationActivatedEventArgs;
+
+                // Parse the query string (using QueryString.NET)
+                UndoEntityDelete(QueryString.Parse(toastActivationArgs.Argument));
+            }*/
             // Ensure the current window is active
             Window.Current.Activate();
         }
@@ -102,8 +126,23 @@ namespace ModernKeePass
         private void OnSuspending(object sender, SuspendingEventArgs e)
         {
             var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
+            Database.Save();
             deferral.Complete();
         }
+        
+        /// <summary>
+        /// Invoked when application is launched from opening a file in Windows Explorer 
+        /// </summary>
+        /// <param name="args">Details about the file being opened</param>
+        protected override void OnFileActivated(FileActivatedEventArgs args)
+        {
+            base.OnFileActivated(args);
+            var rootFrame = new Frame();
+            Database.DatabaseFile = args.Files[0] as StorageFile;
+            rootFrame.Navigate(typeof(Pages.MainPage), args);
+            Window.Current.Content = rootFrame;
+            Window.Current.Activate();
+        }
+        #endregion
     }
 }

ModernKeePass/Common/DatabaseHelper.cs

@@ -0,0 +1,157 @@
+using System;
+using Windows.Storage;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.ViewModels;
+using ModernKeePassLib;
+using ModernKeePassLib.Cryptography.KeyDerivation;
+using ModernKeePassLib.Interfaces;
+using ModernKeePassLib.Keys;
+using ModernKeePassLib.Serialization;
+
+namespace ModernKeePass.Common
+{
+    public class DatabaseHelper
+    {
+        public enum DatabaseStatus
+        {
+            Closed = 0,
+            Opening = 1,
+            Opened = 2
+        }
+        private readonly PwDatabase _pwDatabase = new PwDatabase();
+        private StorageFile _databaseFile;
+        private GroupVm _recycleBin;
+
+        public GroupVm RootGroup { get; set; }
+
+        public GroupVm RecycleBin
+        {
+            get { return _recycleBin; }
+            set
+            {
+                _recycleBin = value;
+                _pwDatabase.RecycleBinUuid = _recycleBin.IdUuid;
+            }
+        }
+        
+        public DatabaseStatus Status { get; private set; } = DatabaseStatus.Closed;
+        public string Name => DatabaseFile?.Name;
+        
+        public bool RecycleBinEnabled
+        {
+            get { return _pwDatabase.RecycleBinEnabled; }
+            set { _pwDatabase.RecycleBinEnabled = value; }
+        }
+        
+        public StorageFile DatabaseFile
+        {
+            get { return _databaseFile; }
+            set
+            {
+                _databaseFile = value;
+                Status = DatabaseStatus.Opening;
+            }
+        }
+
+        public PwUuid DataCipher
+        {
+            get { return _pwDatabase.DataCipherUuid; }
+            set { _pwDatabase.DataCipherUuid = value; }
+        }
+
+        public PwCompressionAlgorithm CompressionAlgorithm
+        {
+            get { return _pwDatabase.Compression; }
+            set { _pwDatabase.Compression = value; }
+        }
+
+        public KdfParameters KeyDerivation
+        {
+            get { return _pwDatabase.KdfParameters; }
+            set { _pwDatabase.KdfParameters = value; }
+        }
+        
+        /// <summary>
+        /// Open a KeePass database
+        /// </summary>
+        /// <param name="key">The database composite key</param>
+        /// <param name="createNew">True to create a new database before opening it</param>
+        /// <returns>An error message, if any</returns>
+        public string Open(CompositeKey key, bool createNew = false)
+        {
+            try
+            {
+                if (key == null) return "No composite key";
+                var ioConnection = IOConnectionInfo.FromFile(DatabaseFile);
+                if (createNew) _pwDatabase.New(ioConnection, key);
+                else _pwDatabase.Open(ioConnection, key, new NullStatusLogger());
+
+                if (_pwDatabase.IsOpen)
+                {
+                    Status = DatabaseStatus.Opened;
+                    RootGroup = new GroupVm(_pwDatabase.RootGroup, null, RecycleBinEnabled ? _pwDatabase.RecycleBinUuid : null);
+                }
+            }
+            catch (ArgumentNullException)
+            {
+                return "Password cannot be empty";
+            }
+            catch (InvalidCompositeKeyException)
+            {
+                return "Wrong password";
+            }
+            catch (Exception ex)
+            {
+                return ex.Message;
+            }
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// Save the current database to another file and open it
+        /// </summary>
+        /// <param name="file">The new database file</param>
+        internal void Save(StorageFile file)
+        {
+            DatabaseFile = file;
+            _pwDatabase.SaveAs(IOConnectionInfo.FromFile(DatabaseFile), true, new NullStatusLogger());
+            Status = DatabaseStatus.Opened;
+        }
+
+        /// <summary>
+        /// Commit the changes to the currently opened database to file
+        /// </summary>
+        public void Save()
+        {
+            // TODO: Save is disabled for now for Argon2Kdf because it corrupts DB (read works)
+            if (_pwDatabase == null || !_pwDatabase.IsOpen /*|| KdfPool.Get(KeyDerivation.KdfUuid) is Argon2Kdf*/) return;
+            _pwDatabase.Save(new NullStatusLogger());
+        }
+
+        /// <summary>
+        /// Close the currently opened database
+        /// </summary>
+        public void Close()
+        {
+            _pwDatabase?.Close();
+            Status = DatabaseStatus.Closed;
+        }
+
+        public void AddDeletedItem(PwUuid id)
+        {
+            _pwDatabase.DeletedObjects.Add(new PwDeletedObject(id, DateTime.UtcNow));
+        }
+
+        public void CreateRecycleBin()
+        {
+            RecycleBin = RootGroup.AddNewGroup("Recycle bin");
+            RecycleBin.IsSelected = true;
+            RecycleBin.IconSymbol = Symbol.Delete;
+        }
+
+        public void UpdateCompositeKey(CompositeKey key)
+        {
+            _pwDatabase.MasterKey = key;
+        }
+    }
+}

ModernKeePass/Common/MessageDialogHelper.cs

@@ -0,0 +1,27 @@
+using System;
+using Windows.UI.Popups;
+
+namespace ModernKeePass.Common
+{
+    public static class MessageDialogHelper
+    {
+        public static async void ShowDeleteConfirmationDialog(string actionText, string contentText, UICommandInvokedHandler action)
+        {
+            // Create the message dialog and set its content
+            var messageDialog = new MessageDialog(contentText);
+
+            // Add commands and set their callbacks; both buttons use the same callback function instead of inline event handlers
+            messageDialog.Commands.Add(new UICommand(actionText, action));
+            messageDialog.Commands.Add(new UICommand("Cancel"));
+
+            // Set the command that will be invoked by default
+            messageDialog.DefaultCommandIndex = 1;
+
+            // Set the command to be invoked when escape is pressed
+            messageDialog.CancelCommandIndex = 1;
+
+            // Show the message dialog
+            await messageDialog.ShowAsync();
+        }
+    }
+}

ModernKeePass/Common/NotifyPropertyChangedBase.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace ModernKeePass.Common
+{
+    public class NotifyPropertyChangedBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected void OnPropertyChanged(string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        protected bool SetProperty<T>(ref T property, T value, [CallerMemberName] string propertyName = "")
+        {
+            if (EqualityComparer<T>.Default.Equals(property, value))
+            {
+                return false;
+            }
+
+            property = value;
+            OnPropertyChanged(propertyName);
+            return true;
+        }
+    }
+}

ModernKeePass/Common/ObservableDictionary.cs

@@ -46,6 +46,14 @@ namespace ModernKeePass.Common
             this.Add(item.Key, item.Value);
         }
 
+        public void AddRange(IEnumerable<KeyValuePair<string, object>> values)
+        {
+            foreach (var value in values)
+            {
+                Add(value);
+            }
+        }
+
         public bool Remove(string key)
         {
             if (this._dictionary.Remove(key))

ModernKeePass/Common/ToastNotificationHelper.cs

@@ -0,0 +1,36 @@
+using System;
+using Windows.Data.Json;
+using Windows.Data.Xml.Dom;
+using Windows.UI.Notifications;
+using ModernKeePass.Interfaces;
+using ModernKeePass.ViewModels;
+
+namespace ModernKeePass.Common
+{
+    public static class ToastNotificationHelper
+    {
+        public static void ShowMovedToast(IPwEntity entity, string action, string text)
+        {
+            var entityType = entity is GroupVm ? "Group" : "Entry";
+            var notificationXml = ToastNotificationManager.GetTemplateContent(ToastTemplateType.ToastText02);
+            var toastElements = notificationXml.GetElementsByTagName("text");
+            toastElements[0].AppendChild(notificationXml.CreateTextNode($"{action} {entityType} {entity.Name}"));
+            toastElements[1].AppendChild(notificationXml.CreateTextNode(text));
+            var toastNode = notificationXml.SelectSingleNode("/toast");
+
+            var launch = new JsonObject
+            {
+                {"entityType", JsonValue.CreateStringValue(entityType)},
+                {"entityId", JsonValue.CreateStringValue(entity.Id)}
+            };
+            ((XmlElement)toastNode)?.SetAttribute("launch", launch.Stringify());
+
+            var toast = new ToastNotification(notificationXml)
+            {
+                ExpirationTime = DateTime.Now.AddSeconds(5)
+            };
+            ToastNotificationManager.CreateToastNotifier().Show(toast);
+        }
+        
+    }
+}

ModernKeePass/Controls/CompositeKeyUserControl.xaml

@@ -0,0 +1,54 @@
+<UserControl x:Name="UserControl"
+    x:Class="ModernKeePass.Controls.CompositeKeyUserControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:actions="using:ModernKeePass.Actions" 
+    xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    mc:Ignorable="d"
+    d:DesignHeight="120"
+    d:DesignWidth="550" >
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="ErrorColorBrush" Color="Red"/>
+        <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
+        <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToForegroungBrushConverter"/>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <converters:DiscreteIntToSolidColorBrushConverter x:Key="DiscreteIntToSolidColorBrushConverter"/>
+    </UserControl.Resources>
+    <Grid x:Name="Grid">
+        <!-- DataContext is not set at the root of the control because of issues happening when displaying it -->
+        <Grid.DataContext>
+            <viewModels:CompositeKeyVm />
+        </Grid.DataContext>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="50" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="45" />
+            <RowDefinition Height="40" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" />
+        <PasswordBox Grid.Row="0" Grid.Column="1" x:Name="PasswordBox" Password="{Binding Password, Mode=TwoWay}" Height="30" IsEnabled="{Binding HasPassword}" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" PlaceholderText="Password" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" >
+            <interactivity:Interaction.Behaviors>
+                <core:DataTriggerBehavior Binding="{Binding HasPassword}" Value="True">
+                    <actions:SetupFocusAction TargetObject="{Binding ElementName=PasswordBox}" />
+                </core:DataTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+        </PasswordBox>
+        <ProgressBar Grid.Row="0" Grid.Column="1" 
+                     Maximum="128" VerticalAlignment="Bottom" 
+                     Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}"
+                     Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushConverter}}" 
+                     Visibility="{Binding ShowComplexityIndicator, ElementName=UserControl, Converter={StaticResource BooleanToVisibilityConverter}}" />
+        <CheckBox Grid.Row="1" Grid.Column="0" IsChecked="{Binding HasKeyFile, Mode=TwoWay}" />
+        <HyperlinkButton Grid.Row="1" Grid.Column="1" Margin="-15,0,0,0" Content="Select key file from disk..." IsEnabled="{Binding HasKeyFile}" Click="KeyFileButton_Click" />
+        <Button Grid.Column="0" Grid.Row="2" Content="OK" Click="OpenButton_OnClick" Background="{ThemeResource ListViewItemSelectedPointerOverBorderThemeBrush}" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" IsEnabled="{Binding IsValid}" />
+        <TextBlock Grid.Column="1" Grid.Row="2" Height="28" FontSize="14" FontWeight="Light" HorizontalAlignment="Right" Text="{Binding Status}" Foreground="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" />
+    </Grid>
+</UserControl>

ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs

@@ -0,0 +1,84 @@
+using System;
+using Windows.Storage.Pickers;
+using Windows.System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Input;
+using ModernKeePass.Common;
+using ModernKeePass.Events;
+using ModernKeePass.ViewModels;
+
+// Pour en savoir plus sur le modèle d'élément Contrôle utilisateur, consultez la page http://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace ModernKeePass.Controls
+{
+    public sealed partial class CompositeKeyUserControl
+    {
+        public CompositeKeyVm Model => Grid.DataContext as CompositeKeyVm;
+
+        public bool CreateNew
+        {
+            get { return (bool)GetValue(CreateNewProperty); }
+            set { SetValue(CreateNewProperty, value); }
+        }
+        public static readonly DependencyProperty CreateNewProperty =
+            DependencyProperty.Register(
+                "CreateNew",
+                typeof(bool),
+                typeof(CompositeKeyUserControl),
+                new PropertyMetadata(false, (o, args) => { }));
+
+        public bool UpdateKey
+        {
+            get { return (bool)GetValue(UpdateKeyProperty); }
+            set { SetValue(UpdateKeyProperty, value); }
+        }
+        public static readonly DependencyProperty UpdateKeyProperty =
+            DependencyProperty.Register(
+                "UpdateKey",
+                typeof(bool),
+                typeof(CompositeKeyUserControl),
+                new PropertyMetadata(false, (o, args) => { }));
+
+        public bool ShowComplexityIndicator => CreateNew || UpdateKey;
+
+        public CompositeKeyUserControl()
+        {
+            InitializeComponent();
+        }
+
+        public event PasswordCheckingEventHandler ValidationChecking;
+        public delegate void PasswordCheckingEventHandler(object sender, EventArgs e);
+        public event PasswordCheckedEventHandler ValidationChecked;
+        public delegate void PasswordCheckedEventHandler(object sender, PasswordEventArgs e);
+
+        private void OpenButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            ValidationChecking?.Invoke(this, new EventArgs());
+
+            if (UpdateKey) Model.UpdateKey();
+            else if (Model.OpenDatabase(CreateNew) == DatabaseHelper.DatabaseStatus.Opened)
+            {
+                ValidationChecked?.Invoke(this, new PasswordEventArgs(Model.RootGroup));
+            }
+        }
+
+        private void PasswordBox_KeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            if (e.Key == VirtualKey.Enter) OpenButton_OnClick(null, null);
+        }
+
+        private async void KeyFileButton_Click(object sender, RoutedEventArgs e)
+        {
+            var picker =
+                new FileOpenPicker
+                {
+                    ViewMode = PickerViewMode.List,
+                    SuggestedStartLocation = PickerLocationId.DocumentsLibrary
+                };
+            picker.FileTypeFilter.Add(".key");
+
+            // Application now has read/write access to the picked file
+            Model.KeyFile = await picker.PickSingleFileAsync();
+        }
+    }
+}

ModernKeePass/Controls/ListViewWithDisable.cs

@@ -0,0 +1,20 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Interfaces;
+
+namespace ModernKeePass.Controls
+{
+    public class ListViewWithDisable: ListView
+    {
+        protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
+        {
+            base.PrepareContainerForItemOverride(element, item);
+
+            var container = element as ListViewItem;
+            var binaryItem = item as IIsEnabled;
+            if (container == null || binaryItem == null) return;
+            container.IsEnabled = binaryItem.IsEnabled;
+            container.IsHitTestVisible = binaryItem.IsEnabled;
+        }
+    }
+}

ModernKeePass/Controls/TextBoxWithButton.cs

@@ -0,0 +1,44 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace ModernKeePass.Controls
+{
+    public class TextBoxWithButton : TextBox
+    {
+        /*public Symbol ButtonSymbol
+        {
+            get { return (Symbol)GetValue(ButtonSymbolProperty); }
+            set { SetValue(ButtonSymbolProperty, value); }
+        }
+        public static readonly DependencyProperty ButtonSymbolProperty =
+            DependencyProperty.Register(
+                "ButtonSymbol",
+                typeof(Symbol),
+                typeof(TextBoxWithButton),
+                new PropertyMetadata(Symbol.Delete, (o, args) => { }));*/
+
+        public string ButtonSymbol
+        {
+            get { return (string)GetValue(ButtonSymbolProperty); }
+            set { SetValue(ButtonSymbolProperty, value); }
+        }
+        public static readonly DependencyProperty ButtonSymbolProperty =
+            DependencyProperty.Register(
+                "ButtonSymbol",
+                typeof(string),
+                typeof(TextBoxWithButton),
+                new PropertyMetadata("", (o, args) => { }));
+        public event EventHandler<RoutedEventArgs> ButtonClick;
+
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            var actionButton = GetTemplateChild("ActionButton") as Button;
+            if (actionButton != null)
+            {
+                actionButton.Click += (sender, e) => ButtonClick?.Invoke(sender, e);
+            }
+        }
+    }
+}

ModernKeePass/Converters/BooleanToFontStyleConverter.cs

@@ -0,0 +1,20 @@
+using System;
+using Windows.UI.Text;
+using Windows.UI.Xaml.Data;
+
+namespace ModernKeePass.Converters
+{
+    public class BooleanToFontStyleConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var boolean = value is bool ? (bool)value : false;
+            return boolean ? FontStyle.Italic : FontStyle.Normal;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ModernKeePass/Converters/BooleanToVisibilityConverter.cs

@@ -0,0 +1,28 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace ModernKeePass.Converters
+{
+    public class BooleanToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var boolean = value is bool ? (bool) value : false;
+            return boolean ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        // No need to implement this
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            var visibility = value is Visibility ? (Visibility) value : Visibility.Visible;
+            switch (visibility)
+            {
+                case Visibility.Visible: return true;
+                case Visibility.Collapsed: return false;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+    }
+}

ModernKeePass/Converters/ColorToBrushConverter.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Drawing;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Media;
+
+namespace ModernKeePass.Converters
+{
+    public class ColorToBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var color = value is Color ? (Color?) value : Color.Empty;
+            if (color == Color.Empty && parameter is SolidColorBrush) return (SolidColorBrush) parameter;
+            return new SolidColorBrush(Windows.UI.Color.FromArgb(
+                color.Value.A,
+                color.Value.R,
+                color.Value.G,
+                color.Value.B));
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ModernKeePass/Converters/DiscreteIntToSolidColorBrushConverter.cs

@@ -0,0 +1,27 @@
+using System;
+using Windows.UI;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Media;
+
+namespace ModernKeePass.Converters
+{
+    public class DiscreteIntToSolidColorBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var status = System.Convert.ToInt32(value);
+            switch (status)
+            {
+                case 1: return new SolidColorBrush(Colors.Red);
+                case 3: return new SolidColorBrush(Colors.Yellow);
+                case 5: return new SolidColorBrush(Colors.Green);
+                default: return new SolidColorBrush(Colors.Black);
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ModernKeePass/Converters/DoubleToSolidColorBrushConverter.cs

@@ -0,0 +1,31 @@
+using System;
+using Windows.UI;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Media;
+
+namespace ModernKeePass.Converters
+{
+    public class DoubleToSolidColorBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            try
+            {
+                var currentValue = (double) value;
+                var maxValue = double.Parse(parameter as string);
+                var green = System.Convert.ToByte(currentValue / maxValue * byte.MaxValue);
+                var red = (byte) (byte.MaxValue - green);
+                return new SolidColorBrush(Color.FromArgb(255, red, green, 0));
+            }
+            catch (OverflowException)
+            {
+                return new SolidColorBrush(Color.FromArgb(255, 0, byte.MaxValue, 0));
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ModernKeePass/Converters/InverseBooleanToVisibilityConverter.cs

@@ -0,0 +1,28 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace ModernKeePass.Converters
+{
+    public class InverseBooleanToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var boolean = value is bool ? (bool)value : false;
+            return boolean ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        // No need to implement this
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            var visibility = value is Visibility ? (Visibility)value : Visibility.Visible;
+            switch (visibility)
+            {
+                case Visibility.Visible: return false;
+                case Visibility.Collapsed: return true;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+    }
+}

ModernKeePass/Converters/NullToBooleanConverter.cs

@@ -0,0 +1,18 @@
+using System;
+using Windows.UI.Xaml.Data;
+
+namespace ModernKeePass.Converters
+{
+    public class NullToBooleanConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            return value != null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ModernKeePass/Converters/PluralizationConverter.cs

@@ -0,0 +1,24 @@
+using System;
+using Windows.UI.Xaml.Data;
+
+namespace ModernKeePass.Converters
+{
+    public class PluralizationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var pluralizationOptionString = parameter as string;
+            var pluralizationOptions = pluralizationOptionString?.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+            if (pluralizationOptions == null || pluralizationOptions.Length != 2) return string.Empty;
+            var count = value is int ? (int) value : 0;
+            var text = count == 1 ? pluralizationOptions[0] : pluralizationOptions[1];
+            return $"{count} {text}";
+        }
+
+        // No need to implement this
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ModernKeePass/Converters/ProgressBarLegalValuesConverter.cs

@@ -0,0 +1,27 @@
+using System;
+using Windows.UI.Xaml.Data;
+
+namespace ModernKeePass.Converters
+{
+    public class ProgressBarLegalValuesConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var legalValuesOptionString = parameter as string;
+            var legalValuesOptions = legalValuesOptionString?.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+            if (legalValuesOptions == null || legalValuesOptions.Length != 2) return 0;
+
+            var minValue = double.Parse(legalValuesOptions[0]);
+            var maxValue = double.Parse(legalValuesOptions[1]);
+            var count = value is double ? (double)value : 0;
+            if (count > maxValue) return maxValue;
+            if (count < minValue) return minValue;
+            return count;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ModernKeePass/Converters/TextToWidthConverter.cs

@@ -0,0 +1,20 @@
+using System;
+using Windows.UI.Xaml.Data;
+
+namespace ModernKeePass.Converters
+{
+    public class TextToWidthConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var fontSize = double.Parse(parameter as string);
+            var text = value as string;
+            return text?.Length * fontSize ?? 0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ModernKeePass/Events/PasswordEventArgs.cs

@@ -0,0 +1,15 @@
+using System;
+using ModernKeePass.ViewModels;
+
+namespace ModernKeePass.Events
+{
+    public class PasswordEventArgs: EventArgs
+    {
+        public GroupVm RootGroup { get; set; }
+
+        public PasswordEventArgs(GroupVm groupVm)
+        {
+            RootGroup = groupVm;
+        }
+    }
+}

ModernKeePass/Interfaces/IHasSelectableObject.cs

@@ -0,0 +1,7 @@
+namespace ModernKeePass.Interfaces
+{
+    public interface IHasSelectableObject
+    {
+        ISelectableModel SelectedItem { get; set; }
+    }
+}

ModernKeePass/Interfaces/IIsEnabled.cs

@@ -0,0 +1,7 @@
+namespace ModernKeePass.Interfaces
+{
+    public interface IIsEnabled
+    {
+        bool IsEnabled { get; }
+    }
+}

ModernKeePass/Interfaces/IPwEntity.cs

@@ -0,0 +1,38 @@
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.ViewModels;
+
+namespace ModernKeePass.Interfaces
+{
+    public interface IPwEntity
+    {
+        GroupVm ParentGroup { get; }
+        GroupVm PreviousGroup { get; }
+        Symbol IconSymbol { get; }
+        string Id { get; }
+        string Name { get; set; }
+        string Path { get; }
+        bool IsEditMode { get; }
+
+        /// <summary>
+        /// Move a entity to the destination group
+        /// </summary>
+        /// <param name="destination">The destination to move the entity to</param>
+        void Move(GroupVm destination);
+        /// <summary>
+        /// Delete from Model
+        /// </summary>
+        void CommitDelete();
+        /// <summary>
+        /// Restore ViewModel
+        /// </summary>
+        void UndoDelete();
+        /// <summary>
+        /// Save changes to Model
+        /// </summary>
+        void Save();
+        /// <summary>
+        /// Delete from ViewModel
+        /// </summary>
+        void MarkForDelete();
+    }
+}

ModernKeePass/Interfaces/ISelectableModel.cs

@@ -0,0 +1,7 @@
+namespace ModernKeePass.Interfaces
+{
+    public interface ISelectableModel
+    {
+        bool IsSelected { get; set; }
+    }
+}

ModernKeePass/MainPage.xaml

@@ -1,41 +0,0 @@
-<Page
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ModernKeePass"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ViewModels="using:ModernKeePass.ViewModels"
-    x:Class="ModernKeePass.MainPage"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" >
-    <Page.DataContext>
-        <ViewModels:DatabaseVm/>
-    </Page.DataContext>
-
-    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="250" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="50" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Button Grid.Column="0" Grid.Row="0" x:Name="selectButton" Content="Select password database" Click="Button_Click" HorizontalAlignment="Center" />
-        <Grid Grid.Column="0" Grid.Row="2" HorizontalAlignment="Center" Height="auto" VerticalAlignment="Top" Width="auto" Visibility="{Binding Visibility}" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="100" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <TextBlock Grid.Column="0" Grid.Row="0" x:Name="passwordTextBlock" HorizontalAlignment="Left" TextWrapping="Wrap" Text="Password" VerticalAlignment="Center" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
-            <PasswordBox Grid.Column="1" Grid.Row="0" x:Name="passwordBox" VerticalAlignment="Top" HorizontalAlignment="Right" Width="130" Password="{Binding Password, Mode=TwoWay}" IsPasswordRevealButtonEnabled="True" Margin="0,0,10,0"/>
-            <Button Grid.Column="1" Grid.Row="1" x:Name="openBbutton" Content="Open" HorizontalAlignment="Right" VerticalAlignment="Top" Click="openBbutton_Click" Margin="0,0,7,0" Width="auto"/>
-            <TextBlock Grid.Column="1" Grid.Row="2" x:Name="errorTextBlock" TextWrapping="Wrap" Text="{Binding ErrorMessage}" HorizontalAlignment="Right" Height="auto" Width="auto" Foreground="#FF9E0909" Margin="0,0,10,0"/>
-        </Grid>
-    </Grid>
-</Page>

ModernKeePass/MainPage.xaml.cs

@@ -1,49 +0,0 @@
-using System;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-
-using ModernKeePass.Pages;
-using ModernKeePass.ViewModels;
-
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ModernKeePass
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class MainPage : Page
-    {
-        public MainPage()
-        {
-            this.InitializeComponent();
-        }
-        
-        private async void Button_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-        {
-            var picker = new Windows.Storage.Pickers.FileOpenPicker();
-            picker.ViewMode = Windows.Storage.Pickers.PickerViewMode.List;
-            picker.SuggestedStartLocation =
-                Windows.Storage.Pickers.PickerLocationId.DocumentsLibrary;
-            picker.FileTypeFilter.Add(".kdbx");
-
-            var file = await picker.PickSingleFileAsync();
-            if (file != null)
-            {
-                // Application now has read/write access to the picked file
-                DataContext = new DatabaseVm(file);
-            }
-            else
-            {
-            }
-        }
-        
-        private void openBbutton_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-        {
-            var database = DataContext as DatabaseVm;
-            database.Open();
-            if (database.IsOpen)
-                Frame.Navigate(typeof(GroupDetailPage), database.RootGroup);
-        }
-    }
-}

ModernKeePass/Mappings/PwIconToSegoeMapping.cs

@@ -0,0 +1,477 @@
+using Windows.UI.Xaml.Controls;
+using ModernKeePassLib;
+
+namespace ModernKeePass.Mappings
+{
+    public static class PwIconToSegoeMapping
+    {
+        public static Symbol GetSymbolFromIcon(PwIcon icon)
+        {
+            switch (icon)
+            {
+                case PwIcon.Key: return Symbol.Permissions;
+                case PwIcon.WorldSocket:
+                case PwIcon.World: return Symbol.World;
+                case PwIcon.Warning: return Symbol.Important;
+                case PwIcon.WorldComputer:
+                case PwIcon.Drive:
+                case PwIcon.DriveWindows:
+                case PwIcon.NetworkServer: return Symbol.MapDrive;
+                case PwIcon.MarkedDirectory: return Symbol.Map;
+                case PwIcon.UserCommunication: return Symbol.ContactInfo;
+                case PwIcon.Parts: return Symbol.ViewAll;
+                case PwIcon.Notepad: return Symbol.Document;
+                case PwIcon.Identity: return Symbol.Contact2;
+                case PwIcon.PaperReady: return Symbol.SyncFolder;
+                case PwIcon.Digicam: return Symbol.Camera;
+                case PwIcon.IRCommunication: return Symbol.View;
+                case PwIcon.Energy: return Symbol.ZeroBars;
+                case PwIcon.Scanner: return Symbol.Scan;
+                case PwIcon.CDRom: return Symbol.Rotate;
+                case PwIcon.Monitor: return Symbol.Caption;
+                case PwIcon.EMailBox: 
+                case PwIcon.EMail: return Symbol.Mail;
+                case PwIcon.Configuration: return Symbol.Setting;
+                case PwIcon.ClipboardReady: return Symbol.Paste;
+                case PwIcon.PaperNew: return Symbol.Page2;
+                case PwIcon.Screen: return Symbol.GoToStart;
+                case PwIcon.EnergyCareful: return Symbol.FourBars;
+                case PwIcon.Disk: return Symbol.Save;
+                //case PwIcon.PaperQ: return Symbol.;
+                //case PwIcon.TerminalEncrypted: return Symbol.;
+                case PwIcon.Console: return Symbol.SlideShow;
+                case PwIcon.Printer: return Symbol.Scan;
+                case PwIcon.ProgramIcons: return Symbol.GoToStart;
+                //case PwIcon.Run: return Symbol.;
+                case PwIcon.Settings:
+                case PwIcon.Tool: return Symbol.Repair;
+                case PwIcon.Archive: return Symbol.Crop;
+                case PwIcon.Count: return Symbol.Calculator;
+                case PwIcon.Clock: return Symbol.Clock;
+                case PwIcon.EMailSearch: return Symbol.Find;
+                case PwIcon.PaperFlag: return Symbol.Flag;
+                //case PwIcon.Memory: return Symbol.;
+                case PwIcon.TrashBin: return Symbol.Delete;
+                case PwIcon.Expired: return Symbol.Cancel;
+                case PwIcon.Info: return Symbol.Help;
+                //case PwIcon.Package: return Symbol.;
+                case PwIcon.Folder:
+                case PwIcon.FolderOpen: 
+                case PwIcon.FolderPackage: return Symbol.Folder;
+                //case PwIcon.LockOpen: return Symbol.;
+                case PwIcon.PaperLocked: return Symbol.ProtectedDocument;
+                case PwIcon.Checked: return Symbol.Accept;
+                case PwIcon.Pen: return Symbol.Edit;
+                case PwIcon.Thumbnail: return Symbol.BrowsePhotos;
+                case PwIcon.Book: return Symbol.Library;
+                case PwIcon.List: return Symbol.List;
+                case PwIcon.UserKey: return Symbol.ContactPresence;
+                case PwIcon.Home: return Symbol.Home;
+                case PwIcon.Star: return Symbol.OutlineStar;
+                //case PwIcon.Tux: return Symbol.;
+                //case PwIcon.Feather: return Symbol.;
+                //case PwIcon.Apple: return Symbol.;
+                //case PwIcon.Wiki: return Symbol.;
+                case PwIcon.Money: return Symbol.Shop;
+                case PwIcon.Certificate: return Symbol.PreviewLink;
+                case PwIcon.BlackBerry: return Symbol.CellPhone;
+                default: return Symbol.Stop;
+            }
+        }
+
+        public static PwIcon GetIconFromSymbol(Symbol symbol)
+        {
+            switch (symbol)
+            {
+                /*case Symbol.Previous:
+                    break;
+                case Symbol.Next:
+                    break;
+                case Symbol.Play:
+                    break;
+                case Symbol.Pause:
+                    break;
+                case Symbol.Edit:
+                    break;
+                case Symbol.Save:
+                    break;
+                case Symbol.Clear:
+                    break;*/
+                case Symbol.Delete:
+                    return PwIcon.TrashBin;
+                /*case Symbol.Remove:
+                    break;
+                case Symbol.Add:
+                    break;
+                case Symbol.Cancel:
+                    break;
+                case Symbol.Accept:
+                    break;
+                case Symbol.More:
+                    break;
+                case Symbol.Redo:
+                    break;
+                case Symbol.Undo:
+                    break;
+                case Symbol.Home:
+                    break;
+                case Symbol.Up:
+                    break;
+                case Symbol.Forward:
+                    break;
+                case Symbol.Back:
+                    break;
+                case Symbol.Favorite:
+                    break;
+                case Symbol.Camera:
+                    break;
+                case Symbol.Setting:
+                    break;
+                case Symbol.Video:
+                    break;
+                case Symbol.Sync:
+                    break;
+                case Symbol.Download:
+                    break;
+                case Symbol.Mail:
+                    break;
+                case Symbol.Find:
+                    break;
+                case Symbol.Help:
+                    break;
+                case Symbol.Upload:
+                    break;
+                case Symbol.Emoji:
+                    break;
+                case Symbol.TwoPage:
+                    break;
+                case Symbol.LeaveChat:
+                    break;
+                case Symbol.MailForward:
+                    break;
+                case Symbol.Clock:
+                    break;
+                case Symbol.Send:
+                    break;
+                case Symbol.Crop:
+                    break;
+                case Symbol.RotateCamera:
+                    break;
+                case Symbol.People:
+                    break;
+                case Symbol.OpenPane:
+                    break;
+                case Symbol.ClosePane:
+                    break;
+                case Symbol.World:
+                    break;
+                case Symbol.Flag:
+                    break;
+                case Symbol.PreviewLink:
+                    break;
+                case Symbol.Globe:
+                    break;
+                case Symbol.Trim:
+                    break;
+                case Symbol.AttachCamera:
+                    break;
+                case Symbol.ZoomIn:
+                    break;
+                case Symbol.Bookmarks:
+                    break;
+                case Symbol.Document:
+                    break;
+                case Symbol.ProtectedDocument:
+                    break;
+                case Symbol.Page:
+                    break;
+                case Symbol.Bullets:
+                    break;
+                case Symbol.Comment:
+                    break;
+                case Symbol.MailFilled:
+                    break;
+                case Symbol.ContactInfo:
+                    break;
+                case Symbol.HangUp:
+                    break;
+                case Symbol.ViewAll:
+                    break;
+                case Symbol.MapPin:
+                    break;
+                case Symbol.Phone:
+                    break;
+                case Symbol.VideoChat:
+                    break;
+                case Symbol.Switch:
+                    break;
+                case Symbol.Contact:
+                    break;
+                case Symbol.Rename:
+                    break;
+                case Symbol.Pin:
+                    break;
+                case Symbol.MusicInfo:
+                    break;
+                case Symbol.Go:
+                    break;
+                case Symbol.Keyboard:
+                    break;
+                case Symbol.DockLeft:
+                    break;
+                case Symbol.DockRight:
+                    break;
+                case Symbol.DockBottom:
+                    break;
+                case Symbol.Remote:
+                    break;
+                case Symbol.Refresh:
+                    break;
+                case Symbol.Rotate:
+                    break;
+                case Symbol.Shuffle:
+                    break;
+                case Symbol.List:
+                    break;
+                case Symbol.Shop:
+                    break;
+                case Symbol.SelectAll:
+                    break;
+                case Symbol.Orientation:
+                    break;
+                case Symbol.Import:
+                    break;
+                case Symbol.ImportAll:
+                    break;
+                case Symbol.BrowsePhotos:
+                    break;
+                case Symbol.WebCam:
+                    break;
+                case Symbol.Pictures:
+                    break;
+                case Symbol.SaveLocal:
+                    break;
+                case Symbol.Caption:
+                    break;
+                case Symbol.Stop:
+                    break;
+                case Symbol.ShowResults:
+                    break;
+                case Symbol.Volume:
+                    break;
+                case Symbol.Repair:
+                    break;
+                case Symbol.Message:
+                    break;
+                case Symbol.Page2:
+                    break;
+                case Symbol.CalendarDay:
+                    break;
+                case Symbol.CalendarWeek:
+                    break;
+                case Symbol.Calendar:
+                    break;
+                case Symbol.Character:
+                    break;
+                case Symbol.MailReplyAll:
+                    break;
+                case Symbol.Read:
+                    break;
+                case Symbol.Link:
+                    break;
+                case Symbol.Account:
+                    break;
+                case Symbol.ShowBcc:
+                    break;
+                case Symbol.HideBcc:
+                    break;
+                case Symbol.Cut:
+                    break;
+                case Symbol.Attach:
+                    break;
+                case Symbol.Paste:
+                    break;
+                case Symbol.Filter:
+                    break;
+                case Symbol.Copy:
+                    break;
+                case Symbol.Emoji2:
+                    break;
+                case Symbol.Important:
+                    break;
+                case Symbol.MailReply:
+                    break;
+                case Symbol.SlideShow:
+                    break;
+                case Symbol.Sort:
+                    break;
+                case Symbol.Manage:
+                    break;
+                case Symbol.AllApps:
+                    break;
+                case Symbol.DisconnectDrive:
+                    break;
+                case Symbol.MapDrive:
+                    break;
+                case Symbol.NewWindow:
+                    break;
+                case Symbol.OpenWith:
+                    break;
+                case Symbol.ContactPresence:
+                    break;
+                case Symbol.Priority:
+                    break;
+                case Symbol.GoToToday:
+                    break;
+                case Symbol.Font:
+                    break;
+                case Symbol.FontColor:
+                    break;
+                case Symbol.Contact2:
+                    break;
+                case Symbol.Folder:
+                    break;
+                case Symbol.Audio:
+                    break;
+                case Symbol.Placeholder:
+                    break;
+                case Symbol.View:
+                    break;
+                case Symbol.SetLockScreen:
+                    break;
+                case Symbol.SetTile:
+                    break;
+                case Symbol.ClosedCaption:
+                    break;
+                case Symbol.StopSlideShow:
+                    break;
+                case Symbol.Permissions:
+                    break;
+                case Symbol.Highlight:
+                    break;
+                case Symbol.DisableUpdates:
+                    break;
+                case Symbol.UnFavorite:
+                    break;
+                case Symbol.UnPin:
+                    break;
+                case Symbol.OpenLocal:
+                    break;
+                case Symbol.Mute:
+                    break;
+                case Symbol.Italic:
+                    break;
+                case Symbol.Underline:
+                    break;
+                case Symbol.Bold:
+                    break;
+                case Symbol.MoveToFolder:
+                    break;
+                case Symbol.LikeDislike:
+                    break;
+                case Symbol.Dislike:
+                    break;
+                case Symbol.Like:
+                    break;
+                case Symbol.AlignRight:
+                    break;
+                case Symbol.AlignCenter:
+                    break;
+                case Symbol.AlignLeft:
+                    break;
+                case Symbol.Zoom:
+                    break;
+                case Symbol.ZoomOut:
+                    break;
+                case Symbol.OpenFile:
+                    break;
+                case Symbol.OtherUser:
+                    break;
+                case Symbol.Admin:
+                    break;
+                case Symbol.Street:
+                    break;
+                case Symbol.Map:
+                    break;
+                case Symbol.ClearSelection:
+                    break;
+                case Symbol.FontDecrease:
+                    break;
+                case Symbol.FontIncrease:
+                    break;
+                case Symbol.FontSize:
+                    break;
+                case Symbol.CellPhone:
+                    break;
+                case Symbol.ReShare:
+                    break;
+                case Symbol.Tag:
+                    break;
+                case Symbol.RepeatOne:
+                    break;
+                case Symbol.RepeatAll:
+                    break;
+                case Symbol.OutlineStar:
+                    break;
+                case Symbol.SolidStar:
+                    break;
+                case Symbol.Calculator:
+                    break;
+                case Symbol.Directions:
+                    break;
+                case Symbol.Target:
+                    break;
+                case Symbol.Library:
+                    break;
+                case Symbol.PhoneBook:
+                    break;
+                case Symbol.Memo:
+                    break;
+                case Symbol.Microphone:
+                    break;
+                case Symbol.PostUpdate:
+                    break;
+                case Symbol.BackToWindow:
+                    break;
+                case Symbol.FullScreen:
+                    break;
+                case Symbol.NewFolder:
+                    break;
+                case Symbol.CalendarReply:
+                    break;
+                case Symbol.UnSyncFolder:
+                    break;
+                case Symbol.ReportHacked:
+                    break;
+                case Symbol.SyncFolder:
+                    break;
+                case Symbol.BlockContact:
+                    break;
+                case Symbol.SwitchApps:
+                    break;
+                case Symbol.AddFriend:
+                    break;
+                case Symbol.TouchPointer:
+                    break;
+                case Symbol.GoToStart:
+                    break;
+                case Symbol.ZeroBars:
+                    break;
+                case Symbol.OneBar:
+                    break;
+                case Symbol.TwoBars:
+                    break;
+                case Symbol.ThreeBars:
+                    break;
+                case Symbol.FourBars:
+                    break;
+                case Symbol.Scan:
+                    break;
+                case Symbol.Preview:
+                    break;*/
+                default:
+                    return PwIcon.Folder;
+            }
+        }
+    }
+}

ModernKeePass/ModernKeePassApp.csproj

@@ -20,6 +20,7 @@
     <PackageCertificateThumbprint>ED3AA34F46D03498F989901C5DB2742B65D72F60</PackageCertificateThumbprint>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -107,26 +108,93 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Actions\ClipboardAction.cs" />
+    <Compile Include="Actions\SetupFocusAction.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Common\DatabaseHelper.cs" />
+    <Compile Include="Common\MessageDialogHelper.cs" />
     <Compile Include="Common\NavigationHelper.cs" />
+    <Compile Include="Common\NotifyPropertyChangedBase.cs" />
     <Compile Include="Common\ObservableDictionary.cs" />
     <Compile Include="Common\RelayCommand.cs" />
     <Compile Include="Common\SuspensionManager.cs" />
-    <Compile Include="MainPage.xaml.cs">
+    <Compile Include="Common\ToastNotificationHelper.cs" />
+    <Compile Include="Converters\DiscreteIntToSolidColorBrushConverter.cs" />
+    <Compile Include="Converters\NullToBooleanConverter.cs" />
+    <Compile Include="Interfaces\IHasSelectableObject.cs" />
+    <Compile Include="Interfaces\ISelectableModel.cs" />
+    <Compile Include="Pages\BasePages\LayoutAwarePageBase.cs" />
+    <Compile Include="Pages\SettingsPageFrames\SettingsDatabasePage.xaml.cs">
+      <DependentUpon>SettingsDatabasePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\SettingsPageFrames\SettingsSecurityPage.xaml.cs">
+      <DependentUpon>SettingsSecurityPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TemplateSelectors\FirstItemDataTemplateSelector.cs" />
+    <Compile Include="Controls\ListViewWithDisable.cs" />
+    <Compile Include="Controls\CompositeKeyUserControl.xaml.cs">
+      <DependentUpon>CompositeKeyUserControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\TextBoxWithButton.cs" />
+    <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
+    <Compile Include="Converters\ColorToBrushConverter.cs" />
+    <Compile Include="Converters\DoubleToSolidColorBrushConverter.cs" />
+    <Compile Include="Converters\InverseBooleanToVisibilityConverter.cs" />
+    <Compile Include="Converters\BooleanToFontStyleConverter.cs" />
+    <Compile Include="Converters\PluralizationConverter.cs" />
+    <Compile Include="Converters\ProgressBarLegalValuesConverter.cs" />
+    <Compile Include="Converters\TextToWidthConverter.cs" />
+    <Compile Include="Events\PasswordEventArgs.cs" />
+    <Compile Include="Interfaces\IIsEnabled.cs" />
+    <Compile Include="Interfaces\IPwEntity.cs" />
+    <Compile Include="Pages\MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Mappings\PwIconToSegoeMapping.cs" />
+    <Compile Include="Pages\MainPageFrames\AboutPage.xaml.cs">
+      <DependentUpon>AboutPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\MainPageFrames\NewDatabasePage.xaml.cs">
+      <DependentUpon>NewDatabasePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\SettingsPage.xaml.cs">
+      <DependentUpon>SettingsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\MainPageFrames\WelcomePage.xaml.cs">
+      <DependentUpon>WelcomePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ViewModels\AboutVm.cs" />
+    <Compile Include="ViewModels\CompositeKeyVm.cs" />
+    <Compile Include="ViewModels\Items\ListMenuItemVm.cs" />
+    <Compile Include="ViewModels\Items\MainMenuItemVm.cs" />
+    <Compile Include="ViewModels\Items\RecentItemVm.cs" />
     <Compile Include="Pages\EntryDetailPage.xaml.cs">
       <DependentUpon>EntryDetailPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\GroupDetailPage.xaml.cs">
       <DependentUpon>GroupDetailPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\MainPageFrames\OpenDatabasePage.xaml.cs">
+      <DependentUpon>OpenDatabasePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\MainPageFrames\RecentDatabasesPage.xaml.cs">
+      <DependentUpon>RecentDatabasesPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\MainPageFrames\SaveDatabasePage.xaml.cs">
+      <DependentUpon>SaveDatabasePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ViewModels\DatabaseVm.cs" />
     <Compile Include="ViewModels\EntryVm.cs" />
     <Compile Include="ViewModels\GroupVm.cs" />
+    <Compile Include="ViewModels\SettingsVm.cs" />
+    <Compile Include="ViewModels\MainVm.cs" />
+    <Compile Include="ViewModels\NewVm.cs" />
+    <Compile Include="ViewModels\OpenVm.cs" />
+    <Compile Include="ViewModels\RecentVm.cs" />
+    <Compile Include="ViewModels\SaveVm.cs" />
+    <Compile Include="ViewModels\Items\SettingsDatabaseVm.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -134,7 +202,9 @@
     </AppxManifest>
     <None Include="ModernKeePass_StoreKey.pfx" />
     <None Include="ModernKeePass_TemporaryKey.pfx" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="Package.StoreAssociation.xml" />
@@ -144,10 +214,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
+    <Page Include="Controls\CompositeKeyUserControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pages\MainPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Pages\MainPageFrames\AboutPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\EntryDetailPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -156,18 +234,90 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\MainPageFrames\NewDatabasePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pages\MainPageFrames\OpenDatabasePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pages\MainPageFrames\RecentDatabasesPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pages\MainPageFrames\SaveDatabasePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pages\SettingsPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pages\MainPageFrames\WelcomePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pages\SettingsPageFrames\SettingsDatabasePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pages\SettingsPageFrames\SettingsSecurityPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\HamburgerButtonStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Page>
+    <Page Include="Styles\ListViewLeftIndicatorStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Page>
+    <Page Include="Styles\NoBorderButtonStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Page>
+    <Page Include="Styles\TextBoxWithButtonStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Page>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="ModernKeePassLib, Version=2.19.0.15913, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ModernKeePassLib.2.19.2950\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\packages\Portable.BouncyCastle.1.8.1.3\lib\netstandard1.0\BouncyCastle.Crypto.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Toolkit.Uwp.Notifications, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Toolkit.Uwp.Notifications.2.0.0\lib\dotnet\Microsoft.Toolkit.Uwp.Notifications.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ModernKeePassLib, Version=2.37.0.2000, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ModernKeePassLib.2.37.6000\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Splat.2.0.0\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\win8\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Validation, Version=2.4.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Validation.2.4.18\lib\portable-net45+win8+wp8+wpa81\Validation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="BehaviorsXamlSDKManaged, Version=12.0">
+      <Name>BehaviorsXamlSDKManaged</Name>
+    </SDKReference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Content Include="Assets\Logo.scale-100.png" />
     <Content Include="Assets\Logo.scale-140.png" />
@@ -214,13 +364,15 @@
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <Import Project="..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets'))" />
   </Target>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Import Project="..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

ModernKeePass/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.1.0.2" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.7.0.28" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
@@ -15,7 +15,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ModernKeePass.App">
-      <m2:VisualElements DisplayName="ModernKeePass" Square150x150Logo="Assets\ModernKeePass-Logo.png" Square30x30Logo="Assets\ModernKeePass-SmallLogo.png" Description="A port of the KeePass application for the Windows store. For now, it only features read-only capabilites and only opens password protected databases." ForegroundText="light" BackgroundColor="#464646" ToastCapable="true">
+      <m2:VisualElements DisplayName="ModernKeePass" Square150x150Logo="Assets\ModernKeePass-Logo.png" Square30x30Logo="Assets\ModernKeePass-SmallLogo.png" Description="A port of the KeePass application for the Windows store. You can create, open and edit KeePass 2.x password databases in a modern fashion." ForegroundText="light" BackgroundColor="#464646" ToastCapable="true">
         <m2:DefaultTile Square310x310Logo="Assets\Square310x310Logo.png" Wide310x150Logo="Assets\Wide310x150Logo.png" Square70x70Logo="Assets\Square70x70Logo.png">
         </m2:DefaultTile>
         <m2:SplashScreen Image="Assets\ModernKeePass-SplashScreen.png" />
@@ -28,6 +28,22 @@
             </SupportedFileTypes>
           </FileOpenPicker>
         </Extension>
+        <Extension Category="windows.fileTypeAssociation">
+          <FileTypeAssociation Name="kdbx">
+            <DisplayName>KeePass 2.x database</DisplayName>
+            <EditFlags OpenIsSafe="true" />
+            <SupportedFileTypes>
+              <FileType ContentType="application/xml">.kdbx</FileType>
+            </SupportedFileTypes>
+          </FileTypeAssociation>
+        </Extension>
+        <Extension Category="windows.fileSavePicker">
+          <FileSavePicker>
+            <SupportedFileTypes>
+              <FileType>.kdbx</FileType>
+            </SupportedFileTypes>
+          </FileSavePicker>
+        </Extension>
       </Extensions>
     </Application>
   </Applications>

ModernKeePass/Pages/BasePages/LayoutAwarePageBase.cs

@@ -0,0 +1,208 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Navigation;
+using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
+
+namespace ModernKeePass.Pages.BasePages
+{
+    public class LayoutAwarePageBase: Page
+    {
+        /// <summary>
+        /// NavigationHelper is used on each page to aid in navigation and 
+        /// process lifetime management
+        /// </summary>
+        public NavigationHelper NavigationHelper { get; }
+
+        public virtual ListView ListView { get; set; }
+        public virtual CollectionViewSource ListViewSource { get; set; }
+        public virtual IHasSelectableObject Model { get; set; }
+
+        public LayoutAwarePageBase()
+        {
+            // Setup the navigation helper
+            NavigationHelper = new NavigationHelper(this);
+            NavigationHelper.LoadState += navigationHelper_LoadState;
+            NavigationHelper.SaveState += navigationHelper_SaveState;
+
+            // Setup the logical page navigation components that allow
+            // the page to only show one pane at a time.
+            NavigationHelper.GoBackCommand = new RelayCommand(() => GoBack(), () => CanGoBack());
+
+            // Start listening for Window size changes 
+            // to change from showing two panes to showing a single pane
+            Window.Current.SizeChanged += Window_SizeChanged;
+            InvalidateVisualState();
+        }
+
+        protected void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            // Invalidate the view state when logical page navigation is in effect, as a change
+            // in selection may cause a corresponding change in the current logical page.  When
+            // an item is selected this has the effect of changing from displaying the item list
+            // to showing the selected item's details.  When the selection is cleared this has the
+            // opposite effect.
+            if (!UsingLogicalPageNavigation()) return;
+            NavigationHelper.GoBackCommand.RaiseCanExecuteChanged();
+            InvalidateVisualState();
+        }
+
+        /// <summary>
+        /// Populates the page with content passed during navigation.  Any saved state is also
+        /// provided when recreating a page from a prior session.
+        /// </summary>
+        /// <param name="sender">
+        /// The source of the event; typically <see cref="Common.NavigationHelper"/>
+        /// </param>
+        /// <param name="e">Event data that provides both the navigation parameter passed to
+        /// <see cref="Frame.Navigate(Type, Object)"/> when this page was initially requested and
+        /// a dictionary of state preserved by this page during an earlier
+        /// session.  The state will be null the first time a page is visited.</param>
+        protected void navigationHelper_LoadState(object sender, LoadStateEventArgs e)
+        {
+            // TODO: Assign a bindable group to Me.DefaultViewModel("Group")
+            // TODO: Assign a collection of bindable items to Me.DefaultViewModel("Items")
+
+            if (e.PageState == null)
+            {
+                // When this is a new page, select the first item automatically unless logical page
+                // navigation is being used (see the logical page navigation #region below.)
+                if (!UsingLogicalPageNavigation() && ListViewSource.View != null)
+                {
+                    ListViewSource.View.MoveCurrentToFirst();
+                }
+            }
+            else
+            {
+                // Restore the previously saved state associated with this page
+                if (e.PageState.ContainsKey("SelectedItem") && ListViewSource.View != null)
+                {
+                    ListViewSource.View.MoveCurrentTo(e.PageState["SelectedItem"]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Preserves state associated with this page in case the application is suspended or the
+        /// page is discarded from the navigation cache.  Values must conform to the serialization
+        /// requirements of <see cref="Common.SuspensionManager.SessionState"/>.
+        /// </summary>
+        /// <param name="sender">The source of the event; typically <see cref="Common.NavigationHelper"/></param>
+        /// <param name="e">Event data that provides an empty dictionary to be populated with
+        /// serializable state.</param>
+        protected void navigationHelper_SaveState(object sender, SaveStateEventArgs e)
+        {
+            if (ListViewSource.View != null)
+            {
+                e.PageState["SelectedItem"] = Model?.SelectedItem;
+            }
+        }
+
+        #region Logical page navigation
+
+        // The split page is designed so that when the Window does have enough space to show
+        // both the list and the details, only one pane will be shown at at time.
+        //
+        // This is all implemented with a single physical page that can represent two logical
+        // pages.  The code below achieves this goal without making the user aware of the
+        // distinction.
+
+        protected const int MinimumWidthForSupportingTwoPanes = 768;
+
+        /// <summary>
+        /// Invoked to determine whether the page should act as one logical page or two.
+        /// </summary>
+        /// <returns>True if the window should show act as one logical page, false
+        /// otherwise.</returns>
+        protected bool UsingLogicalPageNavigation()
+        {
+            return Window.Current.Bounds.Width < MinimumWidthForSupportingTwoPanes;
+        }
+
+        /// <summary>
+        /// Invoked with the Window changes size
+        /// </summary>
+        /// <param name="sender">The current Window</param>
+        /// <param name="e">Event data that describes the new size of the Window</param>
+        protected void Window_SizeChanged(object sender, Windows.UI.Core.WindowSizeChangedEventArgs e)
+        {
+            InvalidateVisualState();
+        }
+
+        protected bool CanGoBack()
+        {
+            if (UsingLogicalPageNavigation() && ListView.SelectedItem != null)
+            {
+                return true;
+            }
+            return NavigationHelper.CanGoBack();
+        }
+        protected void GoBack()
+        {
+            if (UsingLogicalPageNavigation() && ListView.SelectedItem != null)
+            {
+                // When logical page navigation is in effect and there's a selected item that
+                // item's details are currently displayed.  Clearing the selection will return to
+                // the item list.  From the user's point of view this is a logical backward
+                // navigation.
+                ListView.SelectedItem = null;
+            }
+            else
+            {
+                NavigationHelper.GoBack();
+            }
+        }
+
+        protected void InvalidateVisualState()
+        {
+            var visualState = DetermineVisualState();
+            VisualStateManager.GoToState(this, visualState, false);
+            NavigationHelper.GoBackCommand.RaiseCanExecuteChanged();
+        }
+
+        /// <summary>
+        /// Invoked to determine the name of the visual state that corresponds to an application
+        /// view state.
+        /// </summary>
+        /// <returns>The name of the desired visual state.  This is the same as the name of the
+        /// view state except when there is a selected item in portrait and snapped views where
+        /// this additional logical page is represented by adding a suffix of _Detail.</returns>
+        protected string DetermineVisualState()
+        {
+            if (!UsingLogicalPageNavigation())
+                return "PrimaryView";
+
+            // Update the back button's enabled state when the view state changes
+            var logicalPageBack = UsingLogicalPageNavigation() && ListView?.SelectedItem != null;
+
+            return logicalPageBack ? "SinglePane_Detail" : "SinglePane";
+        }
+
+        #endregion
+
+        #region NavigationHelper registration
+
+        /// The methods provided in this section are simply used to allow
+        /// NavigationHelper to respond to the page's navigation methods.
+        /// 
+        /// Page specific logic should be placed in event handlers for the  
+        /// <see cref="Common.NavigationHelper.LoadState"/>
+        /// and <see cref="Common.NavigationHelper.SaveState"/>.
+        /// The navigation parameter is available in the LoadState method 
+        /// in addition to page state preserved during an earlier session.
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            NavigationHelper.OnNavigatedTo(e);
+        }
+
+        protected override void OnNavigatedFrom(NavigationEventArgs e)
+        {
+            NavigationHelper.OnNavigatedFrom(e);
+        }
+
+        #endregion
+    }
+}

ModernKeePass/Pages/EntryDetailPage.xaml

@@ -1,19 +1,412 @@
 <Page
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ModernKeePass.Pages"
-    xmlns:common="using:ModernKeePass.Common"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ViewModels="using:ModernKeePass.ViewModels"
-    x:Name="pageRoot"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    xmlns:converters="using:ModernKeePass.Converters" 
+    xmlns:local="using:ModernKeePass.Controls"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:actions="using:ModernKeePass.Actions"
+    x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.EntryDetailPage"
     mc:Ignorable="d">
+    <Page.Resources>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter"/>
+        <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
+        <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToForegroungBrushComplexityConverter"/>
+        <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
+        <Style TargetType="PasswordBox" x:Name="PasswordBoxWithButtonStyle">
+            <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
+            <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
+            <Setter Property="Foreground" Value="{ThemeResource TextBoxForegroundThemeBrush}" />
+            <Setter Property="Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}" />
+            <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextSelectionHighlightColorThemeBrush}" />
+            <Setter Property="BorderBrush" Value="{ThemeResource TextBoxBorderThemeBrush}" />
+            <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
+            <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+            <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+            <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="PasswordBox">
+                        <Grid>
+                            <Grid.Resources>
+                                <Style x:Name="RevealButtonStyle" TargetType="Button">
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="Button">
+                                                <Grid>
+                                                    <VisualStateManager.VisualStateGroups>
+                                                        <VisualStateGroup x:Name="CommonStates">
+                                                            <VisualState x:Name="Normal" />
+                                                            <VisualState x:Name="PointerOver">
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                                               Storyboard.TargetProperty="BorderBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBorderThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
+                                                                                               Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBackgroundThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                </Storyboard>
+                                                            </VisualState>
+                                                            <VisualState x:Name="Pressed">
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                                               Storyboard.TargetProperty="BorderBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
+                                                                                               Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverForegroundThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                </Storyboard>
+                                                            </VisualState>
+                                                            <VisualState x:Name="Disabled">
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                                                 Storyboard.TargetProperty="Opacity"
+                                                                                 To="0"
+                                                                                 Duration="0" />
+                                                                    <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                                                 Storyboard.TargetProperty="Opacity"
+                                                                                 To="0"
+                                                                                 Duration="0" />
+                                                                </Storyboard>
+                                                            </VisualState>
+                                                        </VisualStateGroup>
+                                                    </VisualStateManager.VisualStateGroups>
+                                                    <Border x:Name="BorderElement"
+                                                        BorderBrush="{ThemeResource TextBoxButtonBorderThemeBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"/>
+                                                    <Border x:Name="BackgroundElement"
+                                                        Background="{ThemeResource TextBoxButtonBackgroundThemeBrush}"
+                                                        Margin="{TemplateBinding BorderThickness}">
+                                                        <TextBlock x:Name="GlyphElement"
+                                                               Foreground="{ThemeResource TextBoxButtonForegroundThemeBrush}"
+                                                               VerticalAlignment="Center"
+                                                               HorizontalAlignment="Center"
+                                                               FontStyle="Normal"
+                                                               Text="&#xE052;"
+                                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                               AutomationProperties.AccessibilityView="Raw"/>
+                                                    </Border>
+                                                </Grid>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
 
+                                <Style x:Name="GeneratorButtonStyle" TargetType="Button">
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="Button">
+                                                <Grid>
+                                                    <VisualStateManager.VisualStateGroups>
+                                                        <VisualStateGroup x:Name="CommonStates">
+                                                            <VisualState x:Name="Normal" >
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
+                                                                                               Storyboard.TargetProperty="Background">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBackgroundThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                                               Storyboard.TargetProperty="BorderBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
+                                                                                               Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedForegroundThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                </Storyboard>
+                                                            </VisualState>
+                                                            <VisualState x:Name="PointerOver">
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
+                                                                                               Storyboard.TargetProperty="Background">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBackgroundThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                                               Storyboard.TargetProperty="BorderBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBorderThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
+                                                                                               Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverForegroundThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                </Storyboard>
+                                                            </VisualState>
+                                                            <VisualState x:Name="Pressed">
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
+                                                                                               Storyboard.TargetProperty="Background">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBackgroundThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                                               Storyboard.TargetProperty="BorderBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
+                                                                                               Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedForegroundThemeBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                </Storyboard>
+                                                            </VisualState>
+                                                            <VisualState x:Name="Disabled">
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                                                 Storyboard.TargetProperty="Opacity"
+                                                                                 To="0"
+                                                                                 Duration="0" />
+                                                                    <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                                                 Storyboard.TargetProperty="Opacity"
+                                                                                 To="0"
+                                                                                 Duration="0" />
+                                                                </Storyboard>
+                                                            </VisualState>
+                                                        </VisualStateGroup>
+                                                    </VisualStateManager.VisualStateGroups>
+                                                    <Border x:Name="BorderElement"
+                                                        BorderBrush="{ThemeResource TextBoxButtonBorderThemeBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"/>
+                                                    <Border x:Name="BackgroundElement"
+                                                        Background="{ThemeResource TextBoxButtonBackgroundThemeBrush}"
+                                                        Margin="{TemplateBinding BorderThickness}">
+                                                        <TextBlock x:Name="GlyphElement"
+                                                               Foreground="{ThemeResource TextBoxButtonForegroundThemeBrush}"
+                                                               VerticalAlignment="Center"
+                                                               HorizontalAlignment="Center"
+                                                               FontStyle="Normal"
+                                                               Text="&#xE15E;"
+                                                               Padding="4,0,4,0"
+                                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                               AutomationProperties.AccessibilityView="Raw"/>
+                                                    </Border>
+                                                </Grid>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </Grid.Resources>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Disabled">
+                                        <Storyboard>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
+                                                                       Storyboard.TargetProperty="Background">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBackgroundThemeBrush}" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBorderThemeBrush}" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Normal">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource TextControlBackgroundThemeOpacity}" />
+                                            <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource TextControlBorderThemeOpacity}" />
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="PointerOver">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource TextControlPointerOverBackgroundThemeOpacity}" />
+                                            <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource TextControlPointerOverBorderThemeOpacity}" />
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Focused" />
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="ButtonStates">
+                                    <VisualState x:Name="ButtonVisible">
+                                        <Storyboard>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RevealButton"
+                                                                       Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Visibility>Visible</Visibility>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="ButtonCollapsed" />
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Border x:Name="BackgroundElement"
+                                Grid.Row="1"
+                                Background="{TemplateBinding Background}"
+                                Margin="{TemplateBinding BorderThickness}"
+                                Grid.ColumnSpan="3"
+                                Grid.RowSpan="1"/>
+                            <Border x:Name="BorderElement"
+                                Grid.Row="1"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Grid.ColumnSpan="3"
+                                Grid.RowSpan="1"/>
+                            <ContentPresenter x:Name="HeaderContentPresenter"
+                                          Grid.Row="0"
+                                          Foreground="{ThemeResource TextBoxForegroundHeaderThemeBrush}"
+                                          Margin="0,4,0,4"
+                                          Grid.ColumnSpan="3"
+                                          Content="{TemplateBinding Header}"
+                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                          FontWeight="Semilight" />
+                            <ScrollViewer x:Name="ContentElement"
+                                Grid.Row="1"
+                                      HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                      VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                      IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+                                      IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+                                      Margin="{TemplateBinding BorderThickness}"
+                                      Padding="{TemplateBinding Padding}"
+                                      IsTabStop="False"
+                                      ZoomMode="Disabled"
+                                      AutomationProperties.AccessibilityView="Raw"/>
+                            <ContentControl x:Name="PlaceholderTextContentPresenter"
+                                      Grid.Row="1"
+                                      Foreground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"
+                                      Margin="{TemplateBinding BorderThickness}"
+                                      Padding="{TemplateBinding Padding}"
+                                      IsTabStop="False"
+                                      Grid.ColumnSpan="3"
+                                      Content="{TemplateBinding PlaceholderText}" 
+                                      IsHitTestVisible="False"/>
+                            <Button x:Name="RevealButton"
+                                Grid.Row="1"
+                                Style="{StaticResource RevealButtonStyle}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsTabStop="False"
+                                Grid.Column="1"
+                                Visibility="Collapsed"
+                                FontSize="{TemplateBinding FontSize}"
+                                VerticalAlignment="Stretch"/>
+                            <Button
+                                Grid.Row="1"
+                                Style="{StaticResource GeneratorButtonStyle}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsTabStop="False"
+                                Grid.Column="2"
+                                Visibility="Visible"
+                                FontSize="{TemplateBinding FontSize}"
+                                VerticalAlignment="Stretch" >
+                                <Button.Flyout>
+                                    <Flyout>
+                                        <interactivity:Interaction.Behaviors>
+                                            <core:DataTriggerBehavior Binding="{Binding Password}" ComparisonCondition="NotEqual" Value="" >
+                                                <!--<actions:CloseFlyoutAction />-->
+                                                <core:CallMethodAction MethodName="Hide" />
+                                            </core:DataTriggerBehavior>
+                                        </interactivity:Interaction.Behaviors>
+                                        <StackPanel>
+                                            <TextBlock>
+                                                <Run Text="Password Length: "/>
+                                                <Run Text="{Binding PasswordLength}" />
+                                            </TextBlock>
+                                            <Slider Value="{Binding PasswordLength, Mode=TwoWay}" Margin="0,-10,0,-20" />
+                                            <CheckBox IsChecked="{Binding UpperCasePatternSelected, Mode=TwoWay}" Content="Upper case (A, B, C, ...)"/>
+                                            <CheckBox IsChecked="{Binding LowerCasePatternSelected, Mode=TwoWay}" Content="Lower case (a, b, c, ...)"/>
+                                            <CheckBox IsChecked="{Binding DigitsPatternSelected, Mode=TwoWay}" Content="Digits (0, 1, 2, ...)"/>
+                                            <CheckBox IsChecked="{Binding MinusPatternSelected, Mode=TwoWay}" Content="Minus (-)"/>
+                                            <CheckBox IsChecked="{Binding UnderscorePatternSelected, Mode=TwoWay}" Content="Underscore (_)"/>
+                                            <CheckBox IsChecked="{Binding SpacePatternSelected, Mode=TwoWay}" Content="Space ( )"/>
+                                            <CheckBox IsChecked="{Binding SpecialPatternSelected, Mode=TwoWay}" Content="Special (!, $, %, ...)"/>
+                                            <CheckBox IsChecked="{Binding BracketsPatternSelected, Mode=TwoWay}" Content="Brackets ([], {}, (), ...)"/>
+                                            <TextBlock Text="Also add these characters:" Margin="0,5,0,0"/>
+                                            <TextBox Text="{Binding CustomChars, Mode=TwoWay}" />
+                                            <Button Content="Generate">
+                                                <interactivity:Interaction.Behaviors>
+                                                    <core:EventTriggerBehavior EventName="Click">
+                                                        <core:CallMethodAction TargetObject="{Binding}" MethodName="GeneratePassword"/>
+                                                    </core:EventTriggerBehavior>
+                                                </interactivity:Interaction.Behaviors>
+                                            </Button>
+                                        </StackPanel>
+                                    </Flyout>
+                                </Button.Flyout>
+                            </Button>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Page.Resources>
     <Page.DataContext>
-        <ViewModels:EntryVm/>
+        <viewModels:EntryVm/>
     </Page.DataContext>
-    
+    <Page.BottomAppBar>
+        <CommandBar x:Name="CommandBar" VerticalAlignment="Center">
+            <CommandBar.SecondaryCommands>
+                <AppBarButton Icon="Save" Label="Save">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:CallMethodAction TargetObject="{Binding}" MethodName="Save"/>
+                            <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </AppBarButton>
+                <AppBarButton Icon="Setting" Label="Settings">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.SettingsPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </AppBarButton>
+            </CommandBar.SecondaryCommands>
+            <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="Click">
+                        <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </AppBarToggleButton>
+            <AppBarButton Icon="Undo" Label="Restore" Visibility="{Binding ParentGroup.IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding PreviousGroup, Converter={StaticResource NullToBooleanConverter}}" Click="RestoreButton_Click">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="Click">
+                        <core:CallMethodAction MethodName="UndoDelete" TargetObject="{Binding}" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </AppBarButton>
+            <AppBarButton Icon="Delete" Label="Delete" Click="DeleteButton_Click" />
+        </CommandBar>
+    </Page.BottomAppBar>
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.ChildrenTransitions>
             <TransitionCollection>
@@ -21,48 +414,94 @@
             </TransitionCollection>
         </Grid.ChildrenTransitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="140"/>
+            <RowDefinition Height="50"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <Grid Grid.Row="1" x:Name="contentRegion">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            <TextBlock x:Name="userTextBlock" Grid.Row="0" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="User name or login" VerticalAlignment="Top" FontSize="18"/>
-            <TextBox x:Name="userTextBox" Grid.Row="1" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="{Binding UserName, Mode=TwoWay}" VerticalAlignment="Top" Width="250" AllowDrop="True"/>
-            <TextBlock x:Name="passwordTextBlock" Grid.Row="2" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="Password" VerticalAlignment="Top" FontSize="18"/>
-            <PasswordBox x:Name="passwordBox" Grid.Row="3" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Password="{Binding Password, Mode=TwoWay}" IsPasswordRevealButtonEnabled="True" Width="250" AllowDrop="True"/>
-            <TextBox x:Name="passwordTextBox" Grid.Row="3" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="{Binding Password, Mode=TwoWay}" VerticalAlignment="Top" Width="250" FontSize="14,667" MaxLength="256" AllowDrop="True" Visibility="Collapsed"/>
-            <CheckBox x:Name="checkBox" Grid.Row="4" Content="Show password" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Checked="checkBox_Checked" Unchecked="checkBox_Unchecked"/>
-            <TextBlock x:Name="urlTextBlock" Grid.Row="5" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="URL" VerticalAlignment="Top" FontSize="18"/>
-            <TextBox x:Name="urlTextBox" Grid.Row="6" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="{Binding URL, Mode=TwoWay}" VerticalAlignment="Top" Width="250" FontSize="14,667" MaxLength="256" AllowDrop="True"/>
-            <TextBlock x:Name="notesTextBlock" Grid.Row="7" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="Notes" VerticalAlignment="Top" FontSize="18"/>
-            <TextBox x:Name="notesTextBox" Grid.Row="8" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" VerticalAlignment="Top" Width="250" Height="32" IsSpellCheckEnabled="True" AllowDrop="True"/>
-            </Grid>
+        <StackPanel x:Name="stackPanel" Grid.Row="1" Margin="20,0,0,0" >
+            <StackPanel.Resources>
+                <Style TargetType="TextBlock">
+                    <Setter Property="Margin" Value="0,20,0,0"/>
+                </Style>
+                <Style TargetType="CheckBox">
+                    <Setter Property="Margin" Value="0,20,0,0"/>
+                </Style>
+            </StackPanel.Resources>
+            <TextBlock TextWrapping="Wrap" Text="User name or login" FontSize="18"/>
+            <local:TextBoxWithButton HorizontalAlignment="Left" Text="{Binding UserName, Mode=TwoWay}" Width="350" Height="32" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="ButtonClick">
+                        <actions:ClipboardAction Text="{Binding UserName}" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </local:TextBoxWithButton>
+            <TextBlock TextWrapping="Wrap" Text="Password"  FontSize="18"/>
+            <PasswordBox HorizontalAlignment="Left" Password="{Binding Password, Mode=TwoWay}" Width="350" Height="32" IsPasswordRevealButtonEnabled="True" Visibility="{Binding IsRevealPassword, Converter={StaticResource InverseBooleanToVisibilityConverter}}" Style="{StaticResource PasswordBoxWithButtonStyle}" />
+            <local:TextBoxWithButton HorizontalAlignment="Left" Text="{Binding Password, Mode=TwoWay}" Width="350" Height="32" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="ButtonClick">
+                        <actions:ClipboardAction Text="{Binding Password}" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </local:TextBoxWithButton>
+            <ProgressBar Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" Maximum="128" Width="350" HorizontalAlignment="Left" Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushComplexityConverter}}" />
+            <CheckBox HorizontalAlignment="Left" Margin="-3,0,0,0" Content="Show password" IsChecked="{Binding IsRevealPassword, Mode=TwoWay}" IsEnabled="{Binding IsRevealPasswordEnabled}" />
+            <TextBlock TextWrapping="Wrap" Text="URL" FontSize="18"/>
+            <local:TextBoxWithButton x:Name="UrlTextBox" HorizontalAlignment="Left" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Style="{StaticResource TextBoxWithButtonStyle}" ButtonClick="UrlButton_Click" ButtonSymbol="&#xE111;" />
+            <TextBlock TextWrapping="Wrap" Text="Notes" FontSize="18"/>
+            <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" />
+            <CheckBox FontSize="18" IsChecked="{Binding HasExpirationDate, Mode=TwoWay}" Content="Expiration date"/>
+            <StackPanel Orientation="Horizontal" IsHitTestVisible="{Binding HasExpirationDate}">
+                <SymbolIcon Symbol="Important" Foreground="DarkRed" Visibility="{Binding HasExpired, Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <ToolTipService.ToolTip>
+                        <ToolTip Content="Password has expired" />
+                    </ToolTipService.ToolTip>
+                </SymbolIcon>
+                <DatePicker Margin="0,0,20,0" Date="{Binding ExpiryDate, Mode=TwoWay}" />
+                <TimePicker Time="{Binding ExpiryTime, Mode=TwoWay}"/>
+            </StackPanel>
+        </StackPanel>
 
         <!-- Bouton Précédent et titre de la page -->
-        <Grid>
+        <Grid Grid.Row="0" Background="{ThemeResource AppBarBackgroundThemeBrush}">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="120"/>
+                <ColumnDefinition Width="60"/>
                 <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="400"/>
             </Grid.ColumnDefinitions>
-            <Button x:Name="backButton" Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
-                        Style="{StaticResource NavigationBackButtonNormalStyle}"
-                        VerticalAlignment="Top"
-                        AutomationProperties.Name="Back"
-                        AutomationProperties.AutomationId="BackButton"
-                        AutomationProperties.ItemType="Navigation Button"/>
-            <TextBlock x:Name="pageTitle" Text="{Binding Title}" Style="{StaticResource HeaderTextBlockStyle}" Grid.Column="1" 
-                        IsHitTestVisible="false" TextWrapping="NoWrap" VerticalAlignment="Bottom" Margin="0,0,30,40"/>
+            <Button Grid.Column="0" 
+                    x:Name="BackButton"
+                    Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
+                    Height="50"
+                    Width="50"
+                    VerticalAlignment="Center"
+                    AutomationProperties.Name="Back"
+                    AutomationProperties.AutomationId="BackButton"
+                    AutomationProperties.ItemType="Navigation Button"
+                    Style="{StaticResource NoBorderButtonStyle}">
+                <SymbolIcon Symbol="Back" />
+            </Button>
+            <StackPanel Grid.Column="1" >
+                <TextBox  
+                    x:Name="TitleTextBox"
+                    Text="{Binding Name, Mode=TwoWay}" 
+                    Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
+                    Background="Transparent"
+                    IsHitTestVisible="{Binding IsEditMode}" 
+                    BorderThickness="0" 
+                    FontSize="20"
+                    FontWeight="SemiBold"
+                    TextWrapping="NoWrap" 
+                    VerticalAlignment="Center" 
+                    PlaceholderText="New entry name...">
+                    <interactivity:Interaction.Behaviors>
+                        <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="True">
+                            <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}" />
+                        </core:DataTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </TextBox>
+                <TextBlock FontSize="12" Text="{Binding Path}" />
+            </StackPanel>
         </Grid>
     </Grid>
 </Page>

ModernKeePass/Pages/EntryDetailPage.xaml.cs

@@ -1,18 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using ModernKeePass.Common;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
+using Windows.ApplicationModel.DataTransfer;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
+using ModernKeePass.Common;
 using ModernKeePass.ViewModels;
 
 // Pour en savoir plus sur le modèle d'élément Page Détail de l'élément, consultez la page http://go.microsoft.com/fwlink/?LinkId=234232
@@ -23,24 +14,21 @@ namespace ModernKeePass.Pages
     /// Page affichant les détails d'un élément au sein d'un groupe, offrant la possibilité de
     /// consulter les autres éléments qui appartiennent au même groupe.
     /// </summary>
-    public sealed partial class EntryDetailPage : Page
+    public sealed partial class EntryDetailPage
     {
-        private NavigationHelper navigationHelper;        
+        public EntryVm Model => (EntryVm) DataContext;
 
         /// <summary>
         /// NavigationHelper est utilisé sur chaque page pour faciliter la navigation et 
         /// gestion de la durée de vie des processus
         /// </summary>
-        public NavigationHelper NavigationHelper
-        {
-            get { return this.navigationHelper; }
-        }
+        public NavigationHelper NavigationHelper { get; }
 
         public EntryDetailPage()
         {
-            this.InitializeComponent();
-            this.navigationHelper = new NavigationHelper(this);
-            this.navigationHelper.LoadState += navigationHelper_LoadState;
+            InitializeComponent();
+            NavigationHelper = new NavigationHelper(this);
+            NavigationHelper.LoadState += navigationHelper_LoadState;
         }
 
         /// <summary>
@@ -51,17 +39,10 @@ namespace ModernKeePass.Pages
         /// Source de l'événement ; en général <see cref="Common.NavigationHelper"/>
         /// </param>
         /// <param name="e">Données d'événement qui fournissent le paramètre de navigation transmis à
-        /// <see cref="Frame.Navigate(Type, Object)"/> lors de la requête initiale de cette page et
+        /// <see cref="Frame.Navigate(Type, object)"/> lors de la requête initiale de cette page et
         /// un dictionnaire d'état conservé par cette page durant une session
         /// antérieure.  L'état n'aura pas la valeur Null lors de la première visite de la page.</param>
-        private void navigationHelper_LoadState(object sender, LoadStateEventArgs e)
-        {
-            object navigationParameter;
-            if (e.PageState != null && e.PageState.ContainsKey("SelectedItem"))
-            {
-                navigationParameter = e.PageState["SelectedItem"];
-            }
-        }
+        private void navigationHelper_LoadState(object sender, LoadStateEventArgs e) {}
 
         #region Inscription de NavigationHelper
 
@@ -76,30 +57,50 @@ namespace ModernKeePass.Pages
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            navigationHelper.OnNavigatedTo(e);
-            if (e.Parameter is EntryVm)
-            {
-                DataContext = e.Parameter as EntryVm;
-            }
+            NavigationHelper.OnNavigatedTo(e);
+            if (!(e.Parameter is EntryVm)) return;
+            DataContext = (EntryVm)e.Parameter;
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
         {
-            navigationHelper.OnNavigatedFrom(e);
+            NavigationHelper.OnNavigatedFrom(e);
         }
 
         #endregion
         
-        private void checkBox_Checked(object sender, RoutedEventArgs e)
+        private void DeleteButton_Click(object sender, RoutedEventArgs e)
         {
-            passwordBox.Visibility = Visibility.Collapsed;
-            passwordTextBox.Visibility = Visibility.Visible;
+            var isRecycleBinEnabled = ((App)Application.Current).Database.RecycleBinEnabled && !Model.ParentGroup.IsSelected;
+            var message = isRecycleBinEnabled
+                ? "Are you sure you want to send this entry to the recycle bin?"
+                : "Are you sure you want to delete this entry?";
+            var text = isRecycleBinEnabled ? "Item moved to the Recycle bin" : "Item permanently removed";
+            MessageDialogHelper.ShowDeleteConfirmationDialog("Delete", message, a =>
+            {
+                ToastNotificationHelper.ShowMovedToast(Model, "Deleting", text);
+                Model.MarkForDelete();
+                if (Frame.CanGoBack) Frame.GoBack();
+            });
         }
 
-        private void checkBox_Unchecked(object sender, RoutedEventArgs e)
+        private void RestoreButton_Click(object sender, RoutedEventArgs e)
         {
-            passwordBox.Visibility = Visibility.Visible;
-            passwordTextBox.Visibility = Visibility.Collapsed;
+            ToastNotificationHelper.ShowMovedToast(Model, "Restored", "Item returned to its original group");
+            if (Frame.CanGoBack) Frame.GoBack();
+        }
+
+        private async void UrlButton_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                var uri = new Uri(UrlTextBox.Text);
+                await Windows.System.Launcher.LaunchUriAsync(uri);
+            }
+            catch
+            {
+                // TODO: Show some error
+            }
         }
     }
 }

ModernKeePass/Pages/GroupDetailPage.xaml

@@ -1,105 +1,304 @@
 <Page
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ModernKeePass.Pages"
-    xmlns:common="using:ModernKeePass.Common"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ViewModels="using:ModernKeePass.ViewModels"
-    x:Name="pageRoot"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:actions="using:ModernKeePass.Actions" 
+    xmlns:templateSelectors="using:ModernKeePass.TemplateSelectors"
+    x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.GroupDetailPage"
     mc:Ignorable="d" >
+    <Page.Resources>
+        <SolidColorBrush x:Key="Transparent" Color="Transparent"/>
+        <SolidColorBrush x:Key="SystemColor" Color="{StaticResource SystemColorButtonFaceColor}" />
+        <converters:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
+        <converters:BooleanToFontStyleConverter x:Key="BooleanToFontStyleConverter"/>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
+    </Page.Resources>
     <Page.DataContext>
-        <ViewModels:GroupVm />
+        <viewModels:GroupVm />
     </Page.DataContext>
-    
+    <Page.BottomAppBar>
+        <CommandBar x:Name="CommandBar" VerticalAlignment="Center">
+            <CommandBar.SecondaryCommands>
+                <AppBarButton Icon="Save" Label="Save">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:CallMethodAction TargetObject="{Binding}" MethodName="Save"/>
+                            <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </AppBarButton>
+                <AppBarButton Icon="Setting" Label="Settings">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.SettingsPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </AppBarButton>
+            </CommandBar.SecondaryCommands>
+            <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="Click">
+                        <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </AppBarToggleButton>
+            <AppBarButton Icon="Undo" Label="Restore" Visibility="{Binding ShowRestore, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding PreviousGroup, Converter={StaticResource NullToBooleanConverter}}" Click="RestoreButton_Click">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="Click">
+                        <core:CallMethodAction MethodName="UndoDelete" TargetObject="{Binding}" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </AppBarButton>
+            <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="DeleteButton_Click" />
+        </CommandBar>
+    </Page.BottomAppBar>
     <Grid>
+        <Grid.Resources>
+            <CollectionViewSource
+                x:Name="GroupsViewSource"
+                Source="{Binding Groups}" />
+            <CollectionViewSource
+                x:Name="EntriesViewSource"
+                Source="{Binding Entries}" />
+            <CollectionViewSource
+                x:Name="EntriesZoomedOutViewSource"
+                Source="{Binding EntriesZoomedOut}" IsSourceGrouped="True"/>
+        </Grid.Resources>
+        <Grid.Background>
+            <StaticResource ResourceKey="ApplicationPageBackgroundThemeBrush"/>
+        </Grid.Background>
         <Grid.ChildrenTransitions>
             <TransitionCollection>
                 <EntranceThemeTransition/>
             </TransitionCollection>
         </Grid.ChildrenTransitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="140"/>
+            <RowDefinition Height="50"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-
-        <Grid.Resources>
-            <CollectionViewSource
-                x:Name="groupsViewSource"
-                Source="{Binding Groups}"/>
-            <CollectionViewSource
-                x:Name="entriesViewSource"
-                Source="{Binding Entries}"/>
-        </Grid.Resources>
-        <!-- Horizontal scrolling grid -->
-        <GridView
-            x:Name="groupsGridView"
-            AutomationProperties.AutomationId="ItemGridView"
-            AutomationProperties.Name="Groups"
-            TabIndex="1"
-            Grid.RowSpan="2"
-            Padding="120,126,120,50"
-            ItemsSource="{Binding Source={StaticResource groupsViewSource}}"
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+        <ListView 
+            Grid.Column="0"
+            x:Name="LeftListView"
+            Margin="0,0,0,-10"
+            SelectionChanged="groups_SelectionChanged"
             IsSwipeEnabled="false"
-            SelectionChanged="groupsGridView_SelectionChanged"
-            SelectedIndex="-1" >
-            <GridView.ItemTemplate>
-                <DataTemplate>
-                    <Grid Height="110" Width="480" Margin="10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Border Background="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
-                            <Image Stretch="UniformToFill" AutomationProperties.Name="{Binding Title}"/>
-                        </Border>
-                        <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
-                            <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
-                            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
-                            <TextBlock Text="{Binding EntryCount}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60"/>
-                            <TextBlock Text="{Binding GroupCount}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60"/>
-                        </StackPanel>
-                    </Grid>
+            IsSynchronizedWithCurrentItem="False"
+            DataContext="{Binding DataContext, ElementName=PageRoot}" 
+            RequestedTheme="Dark"
+            Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+            Foreground="{ThemeResource DefaultTextForegroundThemeBrush}">
+            <ListView.Resources>
+                <DataTemplate x:Name="Collapsed">
+                    <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0">
+                        <ToolTipService.ToolTip>
+                            <ToolTip Content="{Binding Name}" />
+                        </ToolTipService.ToolTip>
+                    </SymbolIcon>
                 </DataTemplate>
-            </GridView.ItemTemplate>
-            <GridView.Header>
-                <StackPanel Width="480" Margin="0,4,14,0">
-                    <ListView x:Name="entriesListView" Height="100" ItemsSource="{Binding Source={StaticResource entriesViewSource}}" Margin="10,0,0,0" SelectionChanged="entriesListView_SelectionChanged">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Grid>
+                <DataTemplate x:Name="Expanded">
+                    <StackPanel Orientation="Horizontal">
+                        <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0" />
+                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" FontStyle="{Binding IsSelected, Converter={StaticResource BooleanToFontStyleConverter}}" />
+                    </StackPanel>
+                </DataTemplate>
+            </ListView.Resources>
+            <ListView.ItemsSource>
+                <Binding Source="{StaticResource GroupsViewSource}"/>
+            </ListView.ItemsSource>
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListViewItem">
+                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                    <!--<Setter Property="HorizontalContentAlignment" Value="Center" />-->
+                    <Setter Property="Padding" Value="0"/>
+                    <Setter Property="Margin" Value="0"/>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.HeaderTemplate>
+                <DataTemplate>
+                    <ToggleButton Style="{StaticResource HamburgerToggleButton}">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="Loaded">
+                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}" TargetObject="{Binding ElementName=LeftListView}"/>
+                            </core:EventTriggerBehavior>
+                            <core:EventTriggerBehavior EventName="Checked">
+                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Expanded}" TargetObject="{Binding ElementName=LeftListView}"/>
+                            </core:EventTriggerBehavior>
+                            <core:EventTriggerBehavior EventName="Unchecked">
+                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}" TargetObject="{Binding ElementName=LeftListView}"/>
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </ToggleButton>
+                </DataTemplate>
+            </ListView.HeaderTemplate>
+        </ListView>
+        <!-- Horizontal scrolling grid -->
+        <SemanticZoom Grid.Column="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" Margin="0,30,0,0">
+            <SemanticZoom.ZoomedInView>
+                <GridView 
+                    x:Name="GridView"
+                    AutomationProperties.AutomationId="ItemGridView"
+                    AutomationProperties.Name="Entries"
+                    TabIndex="1"
+                    SelectionChanged="entries_SelectionChanged"
+                    IsSynchronizedWithCurrentItem="False">
+                    <interactivity:Interaction.Behaviors>
+                        <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="False">
+                            <actions:SetupFocusAction TargetObject="{Binding ElementName=GridView}" />
+                        </core:DataTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                    <GridView.Resources>
+                        <DataTemplate x:Name="GroupFirstItem">
+                            <Border 
+                                BorderThickness="2" 
+                                BorderBrush="{StaticResource SystemColor}" 
+                                Background="{StaticResource HubSectionHeaderPressedForegroundThemeBrush}">
+                                <Grid Height="110" Width="480">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                        <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" RenderTransformOrigin="0.5,0.5" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" >
+                                        <SymbolIcon.RenderTransform>
+                                            <CompositeTransform ScaleX="2" TranslateX="0" TranslateY="0" ScaleY="2"/>
+                                        </SymbolIcon.RenderTransform>
+                                    </SymbolIcon>
+                                    <TextBlock Grid.Column="1" Text="{Binding Name}" FontWeight="Bold" Style="{ThemeResource TitleTextBlockStyle}" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="13,0,0,5"/>
                                 </Grid>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                </StackPanel>
-            </GridView.Header>
-            <GridView.ItemContainerStyle>
-                <Style TargetType="FrameworkElement">
-                    <Setter Property="Margin" Value="52,0,0,2"/>
-                </Style>
-            </GridView.ItemContainerStyle>
-        </GridView>
+                            </Border>
+                        </DataTemplate>
+                        <DataTemplate x:Name="GroupOtherItem">
+                            <Grid Height="110" Width="480" x:Name="EntryGrid" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Border 
+                                    Grid.Column="0" 
+                                    BorderThickness="2" 
+                                    BorderBrush="{StaticResource SystemColor}"
+                                    Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}">
+                                    <SymbolIcon Symbol="{Binding IconSymbol}" Width="100" Height="100" RenderTransformOrigin="0.5,0.5" >
+                                        <SymbolIcon.RenderTransform>
+                                            <CompositeTransform ScaleX="2" TranslateX="0" TranslateY="0" ScaleY="2"/>
+                                        </SymbolIcon.RenderTransform>
+                                    </SymbolIcon>
+                                </Border>
+                                <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,0" >
+                                    <TextBlock x:Name="NameTextBlock" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource TextBoxForegroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}"/>
+                                    <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
+                                    <TextBlock Text="{Binding UserName}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
+                                    <TextBlock Text="{Binding Url}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
+                                </StackPanel>
+                            </Grid>
+                        </DataTemplate>
+                    </GridView.Resources>
+                    <GridView.ItemsSource>
+                        <Binding Source="{StaticResource EntriesViewSource}"/>
+                    </GridView.ItemsSource>
+                    <GridView.DataContext>
+                        <viewModels:EntryVm/>
+                    </GridView.DataContext>
+                    <GridView.ItemTemplateSelector>
+                        <templateSelectors:FirstItemDataTemplateSelector 
+                            FirstItem="{StaticResource GroupFirstItem}" 
+                            OtherItem="{StaticResource GroupOtherItem}" />
+                    </GridView.ItemTemplateSelector>
+                    <GridView.ItemContainerStyle>
+                        <Style TargetType="FrameworkElement">
+                            <Setter Property="Margin" Value="52,0,0,2"/>
+                        </Style>
+                    </GridView.ItemContainerStyle>
+                </GridView>
+            </SemanticZoom.ZoomedInView>
 
+            <SemanticZoom.ZoomedOutView>
+                <ListView
+                    x:Name="SemanticListView"
+                    ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}"
+                    IsSwipeEnabled="false" 
+                    SelectionChanged="groups_SelectionChanged"
+                    IsSynchronizedWithCurrentItem="False">
+                    <ListView.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Horizontal" />
+                        </ItemsPanelTemplate>
+                    </ListView.ItemsPanel>
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Vertical">
+                                <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                    <ListView.GroupStyle>
+                        <GroupStyle HidesIfEmpty="True">
+                            <GroupStyle.HeaderTemplate>
+                                <DataTemplate>
+                                    <Grid Background="LightGray" Margin="0,0,10,0" HorizontalAlignment="Left">
+                                        <TextBlock Text="{Binding Key}" Width="40" Foreground="Black" Margin="30" Style="{StaticResource HeaderTextBlockStyle}"/>
+                                    </Grid>
+                                </DataTemplate>
+                            </GroupStyle.HeaderTemplate>
+                        </GroupStyle>
+                    </ListView.GroupStyle>
+                </ListView>
+            </SemanticZoom.ZoomedOutView>
+        </SemanticZoom>
+
+        </Grid>
         <!-- Back button and page title -->
-        <Grid>
+        <Grid Grid.Row="0" Background="{ThemeResource AppBarBackgroundThemeBrush}">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="120"/>
+                <ColumnDefinition Width="60"/>
                 <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="400"/>
             </Grid.ColumnDefinitions>
-            <Button x:Name="backButton" Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
-                        Style="{StaticResource NavigationBackButtonNormalStyle}"
-                        VerticalAlignment="Top"
-                        AutomationProperties.Name="Back"
-                        AutomationProperties.AutomationId="BackButton"
-                        AutomationProperties.ItemType="Navigation Button"/>
-            <TextBlock x:Name="pageTitle" Text="{Binding Path=Name}" Style="{StaticResource HeaderTextBlockStyle}" Grid.Column="1" 
-                        IsHitTestVisible="false" TextWrapping="NoWrap" VerticalAlignment="Bottom" Margin="0,0,30,40"/>
+            <Button Grid.Column="0" 
+                    x:Name="BackButton"
+                    Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
+                    Height="50"
+                    Width="50"
+                    VerticalAlignment="Center"
+                    AutomationProperties.Name="Back"
+                    AutomationProperties.AutomationId="BackButton"
+                    AutomationProperties.ItemType="Navigation Button"
+                    Style="{StaticResource NoBorderButtonStyle}">
+                <SymbolIcon Symbol="Back" />
+            </Button>
+            <StackPanel Grid.Column="1" >
+                <TextBox
+                    x:Name="TitleTextBox"
+                    Text="{Binding Name, Mode=TwoWay}" 
+                    Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
+                    Background="Transparent"
+                    IsHitTestVisible="{Binding IsEditMode}" 
+                    BorderThickness="0" 
+                    FontSize="20"
+                    FontWeight="SemiBold"
+                    TextWrapping="NoWrap" 
+                    VerticalAlignment="Center" 
+                    PlaceholderText="New group name...">
+                    <interactivity:Interaction.Behaviors>
+                        <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="True">
+                            <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}" />
+                        </core:DataTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </TextBox>
+                <TextBlock FontSize="12" Text="{Binding Path}" />
+            </StackPanel>
+            <SearchBox Grid.Column="2" PlaceholderText="Search..." Width="350" Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}" BorderThickness="0" FontSize="18" SuggestionsRequested="SearchBox_OnSuggestionsRequested" SearchHistoryEnabled="False" ResultSuggestionChosen="SearchBox_OnResultSuggestionChosen" />
         </Grid>
     </Grid>
 </Page>

ModernKeePass/Pages/GroupDetailPage.xaml.cs

@@ -1,6 +1,11 @@
-using ModernKeePass.Common;
+using System;
+using System.Linq;
+using Windows.Storage.Streams;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
+using ModernKeePass.Common;
+using ModernKeePass.Events;
 using ModernKeePass.ViewModels;
 
 // The Group Detail Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234229
@@ -11,25 +16,20 @@ namespace ModernKeePass.Pages
     /// A page that displays an overview of a single group, including a preview of the items
     /// within the group.
     /// </summary>
-    public sealed partial class GroupDetailPage : Page
+    public sealed partial class GroupDetailPage
     {
-        private NavigationHelper navigationHelper;
-        
         /// <summary>
         /// NavigationHelper is used on each page to aid in navigation and 
         /// process lifetime management
         /// </summary>
-        public NavigationHelper NavigationHelper
-        {
-            get { return navigationHelper; }
-        }
-
+        public NavigationHelper NavigationHelper { get; }
+        public GroupVm Model => (GroupVm)DataContext;
 
         public GroupDetailPage()
         {
             InitializeComponent();
-            navigationHelper = new NavigationHelper(this);
-            navigationHelper.LoadState += navigationHelper_LoadState;
+            NavigationHelper = new NavigationHelper(this);
+            NavigationHelper.LoadState += navigationHelper_LoadState;
         }
 
         /// <summary>
@@ -40,12 +40,10 @@ namespace ModernKeePass.Pages
         /// The source of the event; typically <see cref="Common.NavigationHelper"/>
         /// </param>
         /// <param name="e">Event data that provides both the navigation parameter passed to
-        /// <see cref="Frame.Navigate(Type, Object)"/> when this page was initially requested and
+        /// <see cref="Frame.Navigate(Type, object)"/> when this page was initially requested and
         /// a dictionary of state preserved by this page during an earlier
         /// session.  The state will be null the first time a page is visited.</param>
-        private void navigationHelper_LoadState(object sender, LoadStateEventArgs e)
-        {
-        }
+        private void navigationHelper_LoadState(object sender, LoadStateEventArgs e) {}
 
         #region NavigationHelper registration
 
@@ -60,34 +58,103 @@ namespace ModernKeePass.Pages
         /// 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            navigationHelper.OnNavigatedTo(e);
+            NavigationHelper.OnNavigatedTo(e);
 
-            if (e.Parameter is GroupVm)
-            {
-                DataContext = e.Parameter as GroupVm;
-                groupsGridView.SelectedIndex = -1;
-                entriesListView.SelectedIndex = -1;
-            }
+            if (e.Parameter is PasswordEventArgs)
+                DataContext = ((PasswordEventArgs) e.Parameter).RootGroup;
+            else if (e.Parameter is GroupVm)
+                DataContext = (GroupVm) e.Parameter;
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
         {
-            navigationHelper.OnNavigatedFrom(e);
+            NavigationHelper.OnNavigatedFrom(e);
         }
 
         #endregion
         
-        private void groupsGridView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        #region Event Handlers
+
+        private void groups_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            var gridView = sender as GridView;
-            Frame.Navigate(typeof(GroupDetailPage), gridView.SelectedItem as GroupVm);
+            GroupVm group;
+            switch (LeftListView.SelectedIndex)
+            {
+                case -1:
+                    return;
+                case 0:
+                    group = Model.AddNewGroup();
+                    break;
+                default:
+                    group = LeftListView.SelectedItem as GroupVm;
+                    break;
+            }
+            Frame.Navigate(typeof(GroupDetailPage), group);
         }
         
-
-        private void entriesListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void entries_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            var listView = sender as ListView;
-            Frame.Navigate(typeof(EntryDetailPage), listView.SelectedItem as EntryVm);
+            EntryVm entry;
+            switch (GridView.SelectedIndex)
+            {
+                case -1:
+                    return;
+                case 0:
+                    entry = Model.AddNewEntry();
+                    break;
+                default:
+                    entry = GridView.SelectedItem as EntryVm;
+                    break;
+            }
+            Frame.Navigate(typeof(EntryDetailPage), entry);
         }
+
+        private void DeleteButton_Click(object sender, RoutedEventArgs e)
+        {
+            var isRecycleBinEnabled = ((App)Application.Current).Database.RecycleBinEnabled && !Model.IsSelected && !Model.ParentGroup.IsSelected;
+            var message = isRecycleBinEnabled
+                ? "Are you sure you want to send the whole group and all its entries to the recycle bin?"
+                : "Are you sure you want to delete the whole group and all its entries?";
+            var text = isRecycleBinEnabled ? "Item moved to the Recycle bin" : "Item permanently removed";
+            MessageDialogHelper.ShowDeleteConfirmationDialog("Delete", message, a =>
+            {
+                ToastNotificationHelper.ShowMovedToast(Model, "Deleting", text);
+                Model.MarkForDelete();
+                if (Frame.CanGoBack) Frame.GoBack();
+            });
+        }
+
+        private void RestoreButton_Click(object sender, RoutedEventArgs e)
+        {
+            ToastNotificationHelper.ShowMovedToast(Model, "Restored", "Item returned to its original group");
+            if (Frame.CanGoBack) Frame.GoBack();
+        }
+
+        private void SemanticZoom_ViewChangeStarted(object sender, SemanticZoomViewChangedEventArgs e)
+        {
+            // We need to synchronize the two lists (zoomed-in and zoomed-out) because the source is different
+            if (e.IsSourceZoomedInView == false)
+            {
+                e.DestinationItem.Item = e.SourceItem.Item;
+            }
+        }
+
+        private void SearchBox_OnSuggestionsRequested(SearchBox sender, SearchBoxSuggestionsRequestedEventArgs args)
+        {
+            var imageUri = RandomAccessStreamReference.CreateFromUri(new Uri("ms-appx://Assets/Logo.scale-80.png"));
+            var results = Model.Entries.Skip(1).Where(e => e.Name.IndexOf(args.QueryText, StringComparison.OrdinalIgnoreCase) >= 0).Take(5);
+            foreach (var result in results)
+            {
+                args.Request.SearchSuggestionCollection.AppendResultSuggestion(result.Name, result.ParentGroup.Name, result.Id, imageUri, string.Empty);
+            }
+        }
+
+        private void SearchBox_OnResultSuggestionChosen(SearchBox sender, SearchBoxResultSuggestionChosenEventArgs args)
+        {
+            var entry = Model.Entries.Skip(1).FirstOrDefault(e => e.Id == args.Tag);
+            Frame.Navigate(typeof(EntryDetailPage), entry);
+        }
+
+        #endregion
     }
 }

ModernKeePass/Pages/MainPage.xaml

@@ -0,0 +1,150 @@
+<basePages:LayoutAwarePageBase
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="using:ModernKeePass.ViewModels" 
+    xmlns:controls="using:ModernKeePass.Controls" 
+    xmlns:basePages="using:ModernKeePass.Pages.BasePages"
+    x:Class="ModernKeePass.Pages.MainPage"
+    x:Name="PageRoot"
+    mc:Ignorable="d">
+    <Page.Resources>
+        <CollectionViewSource 
+            x:Name="MenuItemsSource" 
+            Source="{Binding MainMenuItems}" 
+            IsSourceGrouped="True" />
+    </Page.Resources>
+
+    <Page.Background>
+        <StaticResource ResourceKey="ApplicationPageBackgroundThemeBrush"/>
+    </Page.Background>
+    <Page.DataContext>
+        <viewModels:MainVm />
+    </Page.DataContext>
+
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.ChildrenTransitions>
+            <TransitionCollection>
+                <EntranceThemeTransition/>
+            </TransitionCollection>
+        </Grid.ChildrenTransitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition x:Name="PrimaryColumn" Width="250" />
+            <ColumnDefinition x:Name="SecondaryColumn" Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <!-- Back button and page title -->
+        <Grid x:Name="TitlePanel" Background="{ThemeResource AppBarBackgroundThemeBrush}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Button x:Name="BackButton"
+                    Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
+                    Visibility="Collapsed"
+                    Height="40"
+                    VerticalAlignment="Center"
+                    AutomationProperties.Name="Back"
+                    AutomationProperties.AutomationId="BackButton"
+                    AutomationProperties.ItemType="Navigation Button"
+                    Style="{StaticResource NoBorderButtonStyle}">
+                <SymbolIcon Symbol="Back" />
+            </Button>
+            <TextBlock x:Name="TitleTextBox" Text="{Binding Name}" Grid.Column="1" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </Grid>
+        <controls:ListViewWithDisable 
+            Grid.Column="0"
+            Grid.Row="1"
+            x:Name="MenuListView"
+            SelectionChanged="MenuListView_SelectionChanged" 
+            Background="{ThemeResource AppBarBackgroundThemeBrush}"
+            ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
+            SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+            IsSynchronizedWithCurrentItem="False"
+            ItemContainerStyle="{StaticResource ListViewLeftIndicatorItemExpanded}">
+            <controls:ListViewWithDisable.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <SymbolIcon Symbol="{Binding SymbolIcon}" />
+                        <TextBlock Text="{Binding Title}" Margin="10,5,0,0" />
+                    </StackPanel>
+                </DataTemplate>
+            </controls:ListViewWithDisable.ItemTemplate>
+            <controls:ListViewWithDisable.GroupStyle>
+                <GroupStyle HidesIfEmpty="True">
+                    <GroupStyle.HeaderTemplate>
+                        <DataTemplate>
+                            <Grid Background="DarkGray" Margin="20,0,0,0">
+                                <Border Height="1" Width="300" HorizontalAlignment="Stretch"/>
+                            </Grid>
+                        </DataTemplate>
+                    </GroupStyle.HeaderTemplate>
+                </GroupStyle>
+            </controls:ListViewWithDisable.GroupStyle>
+        </controls:ListViewWithDisable>
+        <TextBlock x:Name="PageTitleTextBlock" Grid.Column="1" Grid.Row="0" FontSize="24" VerticalAlignment="Center" Margin="10,0,0,0" >
+            <Run Text="{Binding SelectedItem}" />
+        </TextBlock>
+        <Frame x:Name="MenuFrame" Grid.Column="1" Grid.Row="1" Margin="0,10,0,0" />
+
+        <VisualStateManager.VisualStateGroups>
+            <!-- Visual states reflect the application's view state -->
+            <VisualStateGroup x:Name="ViewStates">
+                <VisualState x:Name="PrimaryView" />
+                <VisualState x:Name="SinglePane">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PrimaryColumn" Storyboard.TargetProperty="Width">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="*"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SecondaryColumn" Storyboard.TargetProperty="Width">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MenuFrame" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PageTitleTextBlock" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MenuListView" Storyboard.TargetProperty="Padding">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="120,0,90,60"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+                <!--
+                    When an item is selected and only one pane is shown the details display requires more extensive changes:
+                     * Hide the master list and the column it was in
+                     * Move item details down a row to make room for the title
+                     * Move the title directly above the details
+                     * Adjust padding for details
+                 -->
+                <VisualState x:Name="SinglePane_Detail">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PrimaryColumn" Storyboard.TargetProperty="Width">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MenuListView" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitlePanel" Storyboard.TargetProperty="(Grid.Column)">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackButton" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleTextBox" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PageTitleTextBlock" Storyboard.TargetProperty="Margin">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="60,0,0,0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
+</basePages:LayoutAwarePageBase>

ModernKeePass/Pages/MainPage.xaml.cs

@@ -0,0 +1,37 @@
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+using ModernKeePass.ViewModels;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class MainPage
+    {
+        public new MainVm Model => (MainVm)DataContext;
+        
+        public MainPage()
+        {
+            InitializeComponent();
+            ListView = MenuListView;
+            ListViewSource = MenuItemsSource;
+        }
+
+        private void MenuListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ListView_SelectionChanged(sender, e);
+            var selectedItem = Model.SelectedItem as MainMenuItemVm;
+            selectedItem?.Destination.Navigate(selectedItem.PageType, selectedItem.Parameter);
+        }
+        
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+            DataContext = new MainVm(Frame, MenuFrame);
+            if (Model.SelectedItem == null) MenuFrame.Navigate(typeof(WelcomePage));
+        }
+    }
+}

ModernKeePass/Pages/MainPageFrames/AboutPage.xaml

@@ -0,0 +1,38 @@
+<Page
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    x:Class="ModernKeePass.Pages.AboutPage"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <viewModels:AboutVm/>
+    </Page.DataContext>
+
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}"  Margin="10,0,0,0">
+            <Run Text="{Binding Name}"/>
+            <Run Text="version"/>
+            <Run Text="{Binding Version}" />
+        </TextBlock>
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
+            <Run Text="A modern password manager for the Windows Store"/>
+        </TextBlock>
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
+            <Run Text="Homepage: "/>
+            <Hyperlink NavigateUri="https://github.com/wismna/ModernKeePass">
+                <Run Text="https://github.com/wismna/ModernKeePass"/>
+            </Hyperlink></TextBlock>
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}"  Margin="10,0,0,0">
+            <Run Text="Credits:"/>
+        </TextBlock>
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
+            <Run Text="Dominik Reichl for the KeePass application and file format"/>
+        </TextBlock>
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
+            <Run Text="ArtjomP for his PCL adapatation of the KeePass Library"/>
+        </TextBlock>
+    </StackPanel>
+</Page>

ModernKeePass/Pages/MainPageFrames/AboutPage.xaml.cs

@@ -0,0 +1,15 @@
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class AboutPage
+    {
+        public AboutPage()
+        {
+            InitializeComponent();
+        }
+    }
+}

ModernKeePass/Pages/MainPageFrames/NewDatabasePage.xaml

@@ -0,0 +1,37 @@
+<Page
+    x:Class="ModernKeePass.Pages.NewDatabasePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:local="using:ModernKeePass.Controls"
+    xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core" 
+    mc:Ignorable="d">
+    <Page.Resources>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+    </Page.Resources>
+    <Page.DataContext>
+        <viewModels:NewVm />
+    </Page.DataContext>
+    
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <HyperlinkButton Content="Create new..." Click="ButtonBase_OnClick" />
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Create a new password database to the location of your chosing.</TextBlock>
+        <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <StackPanel Margin="25,0,25,0">
+                <TextBlock Text="{Binding Name}" />
+                <local:CompositeKeyUserControl CreateNew="True" >
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="ValidationChecked">
+                            <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </local:CompositeKeyUserControl>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</Page>
+

ModernKeePass/Pages/MainPageFrames/NewDatabasePage.xaml.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using Windows.Storage.Pickers;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+using ModernKeePass.Events;
+using ModernKeePass.ViewModels;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class NewDatabasePage
+    {
+        private Frame _mainFrame;
+
+        public NewVm Model => (NewVm)DataContext;
+
+        public NewDatabasePage()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+            _mainFrame = e.Parameter as Frame;
+        }
+
+        private async void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        {
+            var savePicker = new FileSavePicker
+            {
+                SuggestedStartLocation = PickerLocationId.DocumentsLibrary,
+                SuggestedFileName = "New Database"
+            };
+            savePicker.FileTypeChoices.Add("KeePass 2.x database", new List<string> { ".kdbx" });
+
+            var file = await savePicker.PickSaveFileAsync();
+            if (file == null) return;
+            Model.OpenFile(file);
+        }
+    }
+}

ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml

@@ -0,0 +1,37 @@
+<Page
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    xmlns:local="using:ModernKeePass.Controls"
+    xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:Core="using:Microsoft.Xaml.Interactions.Core" 
+    x:Class="ModernKeePass.Pages.OpenDatabasePage"
+    mc:Ignorable="d">
+    <Page.Resources>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+    </Page.Resources>
+    <Page.DataContext>
+        <viewModels:OpenVm/>
+    </Page.DataContext>
+
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <HyperlinkButton Content="Browse files..." Click="ButtonBase_OnClick" />
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Open an existing password database from your PC.</TextBlock>
+        <HyperlinkButton Content="From Url..." IsEnabled="False" />
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Open an existing password database from an Internet location (not yet implemented).</TextBlock>
+        <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <StackPanel Margin="25,0,25,0">
+                <TextBlock Text="{Binding Name}" />
+                <local:CompositeKeyUserControl>
+                    <interactivity:Interaction.Behaviors>
+                        <Core:EventTriggerBehavior EventName="ValidationChecked">
+                            <Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
+                        </Core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </local:CompositeKeyUserControl>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</Page>

ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml.cs

@@ -0,0 +1,49 @@
+using System;
+using Windows.Storage.Pickers;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+using ModernKeePass.Events;
+using ModernKeePass.ViewModels;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class OpenDatabasePage
+    {
+        private Frame _mainFrame;
+
+        public OpenVm Model => (OpenVm)DataContext;
+
+        public OpenDatabasePage()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+            _mainFrame = e.Parameter as Frame;
+        }
+
+        private async void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        {
+            var picker =
+                new FileOpenPicker
+                {
+                    ViewMode = PickerViewMode.List,
+                    SuggestedStartLocation = PickerLocationId.DocumentsLibrary
+                };
+            picker.FileTypeFilter.Add(".kdbx");
+            
+            // Application now has read/write access to the picked file
+            var file = await picker.PickSingleFileAsync();
+            if (file == null) return;
+            Model.OpenFile(file);
+        }
+    }
+}

ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml

@@ -0,0 +1,48 @@
+<Page
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    xmlns:local="using:ModernKeePass.Controls"
+    xmlns:converters="using:ModernKeePass.Converters" 
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core" 
+    x:Class="ModernKeePass.Pages.RecentDatabasesPage"
+    mc:Ignorable="d">
+    <Page.Resources>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <CollectionViewSource x:Name="RecentItemsSource" Source="{Binding RecentItems}" />
+    </Page.Resources>
+    <Page.DataContext>
+        <viewModels:RecentVm/>
+    </Page.DataContext>
+    <ListView Background="{StaticResource ApplicationPageBackgroundThemeBrush}"
+        ItemsSource="{Binding Source={StaticResource RecentItemsSource}}"
+        SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+        ItemContainerStyle="{StaticResource ListViewLeftIndicatorItemExpanded}">
+        <ListView.ItemTemplate>
+            <DataTemplate>
+                <Grid Margin="10,0,10,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Row="0" Text="{Binding Name}" Padding="5,0,0,0" />
+                    <TextBlock Grid.Row="1" Text="{Binding Path}" Padding="5,0,0,0" FontSize="10" />
+                    <local:CompositeKeyUserControl Grid.Row="2" x:Name="DatabaseUserControl" HorizontalAlignment="Stretch" MinWidth="400" Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecking="OpenDatabaseUserControl_OnValidationChecking">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="ValidationChecked">
+                                <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </local:CompositeKeyUserControl>
+                </Grid>
+            </DataTemplate>
+        </ListView.ItemTemplate>
+    </ListView>
+</Page>

ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml.cs

@@ -0,0 +1,27 @@
+// Pour en savoir plus sur le modèle d'élément Page vierge, consultez la page http://go.microsoft.com/fwlink/?LinkId=234238
+
+using System;
+using Windows.UI.Xaml;
+using ModernKeePass.ViewModels;
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// Une page vide peut être utilisée seule ou constituer une page de destination au sein d'un frame.
+    /// </summary>
+    public sealed partial class RecentDatabasesPage
+    {
+
+        public RecentVm Model => (RecentVm)DataContext;
+        public RecentDatabasesPage()
+        {
+            InitializeComponent();
+        }
+
+        private void OpenDatabaseUserControl_OnValidationChecking(object sender, EventArgs e)
+        {
+            var app = (App)Application.Current;
+            app.Database.DatabaseFile = ((RecentItemVm)Model.SelectedItem).DatabaseFile;
+        }
+    }
+}

ModernKeePass/Pages/MainPageFrames/SaveDatabasePage.xaml

@@ -0,0 +1,19 @@
+<Page
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    x:Class="ModernKeePass.Pages.SaveDatabasePage"
+    mc:Ignorable="d">
+    <Page.DataContext>
+        <viewModels:SaveVm/>
+    </Page.DataContext>
+
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <HyperlinkButton Content="Save and close" Click="SaveButton_OnClick" />
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">This will save and close the currently opened database.</TextBlock>
+        <HyperlinkButton Content="Save as..." Click="SaveAsButton_OnClick" />
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">This will save the currently opened database as a new file and leave it open.</TextBlock>
+    </StackPanel>
+</Page>

ModernKeePass/Pages/MainPageFrames/SaveDatabasePage.xaml.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using Windows.Storage.Pickers;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+using ModernKeePass.ViewModels;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class SaveDatabasePage
+    {
+        private Frame _mainFrame;
+        public SaveVm Model => (SaveVm)DataContext;
+        public SaveDatabasePage()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+            _mainFrame = e.Parameter as Frame;
+        }
+
+        private void SaveButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            Model.Save();
+            _mainFrame.Navigate(typeof(MainPage));
+        }
+
+        private async void SaveAsButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            var savePicker = new FileSavePicker
+            {
+                SuggestedStartLocation = PickerLocationId.DocumentsLibrary,
+                SuggestedFileName = "New Database"
+            };
+            savePicker.FileTypeChoices.Add("KeePass 2.x database", new List<string> { ".kdbx" });
+
+            var file = await savePicker.PickSaveFileAsync();
+            if (file == null) return;
+            Model.Save(file);
+
+            _mainFrame.Navigate(typeof(MainPage));
+        }
+    }
+}

ModernKeePass/Pages/MainPageFrames/WelcomePage.xaml

@@ -0,0 +1,19 @@
+<Page
+    x:Class="ModernKeePass.Pages.WelcomePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel Orientation="Horizontal" Margin="0,2,0,10">
+            <SymbolIcon Symbol="Back" Margin="0,7,40,0" />
+            <TextBlock Style="{StaticResource SubheaderTextBlockStyle}">Have an existing password database? Open it here.</TextBlock>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" Margin="0,6,0,10">
+            <SymbolIcon Symbol="Back" Margin="0,7,40,0" />
+            <TextBlock Style="{StaticResource SubheaderTextBlockStyle}">Want to create a new password database? Do it here.</TextBlock>
+        </StackPanel>
+    </StackPanel>
+</Page>

ModernKeePass/Pages/MainPageFrames/WelcomePage.xaml.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class WelcomePage : Page
+    {
+        public WelcomePage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}

ModernKeePass/Pages/SettingsPage.xaml

@@ -0,0 +1,145 @@
+<basePages:LayoutAwarePageBase
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:basePages="using:ModernKeePass.Pages.BasePages"
+    xmlns:controls="using:ModernKeePass.Controls"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    x:Name="PageRoot"
+    x:Class="ModernKeePass.Pages.SettingsPage" 
+    mc:Ignorable="d">
+    <Page.Resources>
+        <CollectionViewSource x:Name="MenuItemsSource" Source="{Binding MenuItems}" >
+        </CollectionViewSource>
+    </Page.Resources>
+    <Page.DataContext>
+        <viewModels:SettingsVM />
+    </Page.DataContext>
+
+    <Page.Background>
+        <StaticResource ResourceKey="ApplicationPageBackgroundThemeBrush"/>
+    </Page.Background>
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.ChildrenTransitions>
+            <TransitionCollection>
+                <EntranceThemeTransition/>
+            </TransitionCollection>
+        </Grid.ChildrenTransitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition x:Name="PrimaryColumn" Width="250" />
+            <ColumnDefinition x:Name="SecondaryColumn" Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <!-- Back button and page title -->
+        <Grid x:Name="TitlePanel" Background="{ThemeResource AppBarBackgroundThemeBrush}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Button x:Name="BackButton"
+                    Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
+                    Height="50"
+                    AutomationProperties.Name="Back"
+                    AutomationProperties.AutomationId="BackButton"
+                    AutomationProperties.ItemType="Navigation Button"
+                    Style="{StaticResource NoBorderButtonStyle}">
+                <SymbolIcon Symbol="Back" />
+            </Button>
+            <TextBlock x:Name="TitleTextBox" Text="Settings" Grid.Column="1" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </Grid>
+        <controls:ListViewWithDisable 
+            Grid.Column="0"
+            Grid.Row="1"
+            x:Name="MenuListView"
+            SelectionChanged="MenuListView_SelectionChanged" 
+            Background="{ThemeResource AppBarBackgroundThemeBrush}"
+            ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
+            SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+            IsSynchronizedWithCurrentItem="False"
+            ItemContainerStyle="{StaticResource ListViewLeftIndicatorItemExpanded}">
+            <controls:ListViewWithDisable.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <SymbolIcon Symbol="{Binding SymbolIcon}" />
+                        <TextBlock Text="{Binding Title}" Margin="10,5,0,0" />
+                    </StackPanel>
+                </DataTemplate>
+            </controls:ListViewWithDisable.ItemTemplate>
+            <controls:ListViewWithDisable.GroupStyle>
+                <GroupStyle HidesIfEmpty="True">
+                    <GroupStyle.HeaderTemplate>
+                        <DataTemplate>
+                            <Grid Background="DarkGray" Margin="20,0,0,0">
+                                <Border Height="1" Width="300" HorizontalAlignment="Stretch"/>
+                            </Grid>
+                        </DataTemplate>
+                    </GroupStyle.HeaderTemplate>
+                </GroupStyle>
+            </controls:ListViewWithDisable.GroupStyle>
+        </controls:ListViewWithDisable>
+        <TextBlock x:Name="PageTitleTextBlock" Grid.Column="1" Grid.Row="0" FontSize="24" VerticalAlignment="Center" Margin="10,0,0,0" >
+            <Run Text="{Binding SelectedItem}" />
+        </TextBlock>
+        <Frame x:Name="MenuFrame" Grid.Column="1" Grid.Row="1" Margin="0,10,0,0" />
+
+        <VisualStateManager.VisualStateGroups>
+            <!-- Visual states reflect the application's view state -->
+            <VisualStateGroup x:Name="ViewStates">
+                <VisualState x:Name="PrimaryView" />
+                <VisualState x:Name="SinglePane">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PrimaryColumn" Storyboard.TargetProperty="Width">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="*"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SecondaryColumn" Storyboard.TargetProperty="Width">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MenuFrame" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PageTitleTextBlock" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MenuListView" Storyboard.TargetProperty="Padding">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="120,0,90,60"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+                <!--
+                    When an item is selected and only one pane is shown the details display requires more extensive changes:
+                     * Hide the master list and the column it was in
+                     * Move item details down a row to make room for the title
+                     * Move the title directly above the details
+                     * Adjust padding for details
+                 -->
+                <VisualState x:Name="SinglePane_Detail">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PrimaryColumn" Storyboard.TargetProperty="Width">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MenuListView" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitlePanel" Storyboard.TargetProperty="(Grid.Column)">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackButton" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleTextBox" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PageTitleTextBlock" Storyboard.TargetProperty="Margin">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="60,0,0,0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
+</basePages:LayoutAwarePageBase>

ModernKeePass/Pages/SettingsPage.xaml.cs

@@ -0,0 +1,31 @@
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.ViewModels;
+
+// The Split Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234234
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// A page that displays a group title, a list of items within the group, and details for
+    /// the currently selected item.
+    /// </summary>
+    public sealed partial class SettingsPage
+    {
+        public new SettingsVM Model => (SettingsVM)DataContext;
+
+        public SettingsPage()
+        {
+            InitializeComponent();
+            ListView = MenuListView;
+            ListViewSource = MenuItemsSource;
+        }
+        
+        private void MenuListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ListView_SelectionChanged(sender, e);
+            var selectedItem = Model.SelectedItem as ListMenuItemVm;
+            if (selectedItem == null) return;
+            MenuFrame?.Navigate(selectedItem.PageType);
+        }
+    }
+}

ModernKeePass/Pages/SettingsPageFrames/SettingsDatabasePage.xaml

@@ -0,0 +1,29 @@
+<Page
+    x:Class="ModernKeePass.Pages.SettingsDatabasePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="using:ModernKeePass.ViewModels" 
+    mc:Ignorable="d">
+    <Page.Resources>
+        <CollectionViewSource x:Name="RecycleBinGroups" Source="{Binding Groups}" />
+        <CollectionViewSource x:Name="Ciphers" Source="{Binding Ciphers}" />
+        <CollectionViewSource x:Name="Compressions" Source="{Binding Compressions}" />
+        <CollectionViewSource x:Name="KeyDerivations" Source="{Binding KeyDerivations}" />
+    </Page.Resources>
+    <Page.DataContext>
+        <viewModels:SettingsDatabaseVm />
+    </Page.DataContext>
+    
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <ToggleSwitch Header="Recycle bin" OffContent="Disabled" OnContent="Enabled" IsOn="{Binding HasRecycleBin, Mode=TwoWay}" />
+        <ComboBox ItemsSource="{Binding Source={StaticResource RecycleBinGroups}}" SelectedItem="{Binding SelectedItem, Mode=TwoWay}" IsEnabled="{Binding HasRecycleBin}" />
+        <TextBlock Text="Encryption Algorithm" FontSize="14" Margin="5,20,0,10" />
+        <ComboBox ItemsSource="{Binding Source={StaticResource Ciphers}}" SelectedIndex="{Binding CipherIndex, Mode=TwoWay}" />
+        <TextBlock Text="Compression Algorithm" FontSize="14" Margin="5,20,0,10" />
+        <ComboBox ItemsSource="{Binding Source={StaticResource Compressions}}" SelectedItem="{Binding CompressionName, Mode=TwoWay}" />
+        <TextBlock Text="Key Derivation Algorithm" FontSize="14" Margin="5,20,0,10" />
+        <ComboBox ItemsSource="{Binding Source={StaticResource KeyDerivations}}" SelectedItem="{Binding KeyDerivationName, Mode=TwoWay}" />
+    </StackPanel>
+</Page>

ModernKeePass/Pages/SettingsPageFrames/SettingsDatabasePage.xaml.cs

@@ -0,0 +1,15 @@
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class SettingsDatabasePage
+    {
+        public SettingsDatabasePage()
+        {
+            InitializeComponent();
+        }
+    }
+}

ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml

@@ -0,0 +1,14 @@
+<Page
+    x:Class="ModernKeePass.Pages.SettingsSecurityPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:ModernKeePass.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <TextBlock Text="Change database security options" />
+        <local:CompositeKeyUserControl UpdateKey="True" />
+    </StackPanel>
+</Page>

ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml.cs

@@ -0,0 +1,15 @@
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class SettingsSecurityPage
+    {
+        public SettingsSecurityPage()
+        {
+            InitializeComponent();
+        }
+    }
+}

ModernKeePass/Properties/AssemblyInfo.cs

@@ -6,9 +6,9 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("ModernKeePass")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("A port of KeePass 2.x to Modern UI as a Windows Store application")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("wismna")]
 [assembly: AssemblyProduct("ModernKeePass")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
@@ -24,6 +24,6 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
 [assembly: ComVisible(false)]

ModernKeePass/Styles/HamburgerButtonStyle.xaml

@@ -0,0 +1,47 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style TargetType="ToggleButton" x:Name="HamburgerToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <ContentControl>
+                        <Grid Background="{StaticResource ListViewItemSelectedBackgroundThemeBrush}" Margin="0" Width="50" Height="50">
+                            <Canvas x:Name="hampurger_menu" HorizontalAlignment="Center" Height="17" UseLayoutRounding="False" VerticalAlignment="Center" Width="28">
+                                <Canvas x:Name="Layer_1" Height="17" Canvas.Left="0" Width="28" Margin="0" RenderTransformOrigin="0.5,0.5">
+                                    <Canvas.RenderTransform>
+                                        <CompositeTransform/>
+                                    </Canvas.RenderTransform>
+                                    <Canvas.Projection>
+                                        <PlaneProjection/>
+                                    </Canvas.Projection>
+                                    <Path x:Name="path" Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="{ThemeResource DefaultTextForegroundThemeBrush}" StrokeStartLineCap="Square" StrokeEndLineCap="Square" RenderTransformOrigin="0.5,0.5">
+                                        <Path.RenderTransform>
+                                            <CompositeTransform/>
+                                        </Path.RenderTransform>
+                                    </Path>
+                                    <Path Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="{ThemeResource DefaultTextForegroundThemeBrush}" StrokeStartLineCap="Square" StrokeEndLineCap="Square" Canvas.Top="7"/>
+                                    <Path x:Name="path1" Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="{ThemeResource DefaultTextForegroundThemeBrush}" StrokeStartLineCap="Square" StrokeEndLineCap="Square" Canvas.Top="14" RenderTransformOrigin="0.5,0.5">
+                                        <Path.RenderTransform>
+                                            <CompositeTransform/>
+                                        </Path.RenderTransform>
+                                    </Path>
+                                </Canvas>
+                            </Canvas>
+                        </Grid>
+                    </ContentControl>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Margin" Value="0" />
+    </Style>
+    <Style x:Key="HeaderTextBoxStyle" TargetType="TextBox">
+        <Setter Property="FontSize" Value="40"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+</ResourceDictionary>

ModernKeePass/Styles/ListViewLeftIndicatorStyle.xaml

@@ -0,0 +1,401 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core">
+
+    <!-- Style for Windows.UI.Xaml.Controls.ListViewItem with left selection indicator -->
+    <Style TargetType="ListViewItem" x:Key="ListViewLeftIndicatorItemExpanded">
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="TabNavigation" Value="Local"/>
+        <Setter Property="IsHoldingEnabled" Value="True"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="10,0,0,0"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListViewItem">
+                    <Border x:Name="OuterContainer">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="PointerOverBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SelectedEarmark"
+                                                                       Storyboard.TargetProperty="Fill">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ListViewItemSelectedPointerOverBackgroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <PointerDownThemeAnimation TargetName="ContentContainer" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="PointerOverPressed">
+                                    <Storyboard>
+                                        <PointerDownThemeAnimation TargetName="ContentContainer" />
+                                        <DoubleAnimation Storyboard.TargetName="PointerOverBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SelectedEarmark"
+                                                                       Storyboard.TargetProperty="Fill">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ListViewItemSelectedPointerOverBackgroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="contentPresenter"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource ListViewItemDisabledThemeOpacity}" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="FocusVisual" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                                <VisualState x:Name="PointerFocused"/>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="SelectionHintStates">
+                                <VisualState x:Name="VerticalSelectionHint">
+                                    <Storyboard>
+                                        <SwipeHintThemeAnimation TargetName="ContentBorder" ToVerticalOffset="15" ToHorizontalOffset="0" />
+                                        <SwipeHintThemeAnimation TargetName="SelectedLeftIndicator" ToVerticalOffset="15" ToHorizontalOffset="0" />
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="HintGlyph"
+                                                                       Storyboard.TargetProperty="Opacity"
+                                                                       Duration="0:0:0.500">
+                                            <DiscreteDoubleKeyFrame Value="0.5" KeyTime="0:0:0" />
+                                            <DiscreteDoubleKeyFrame Value="0" KeyTime="0:0:0.500" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="HorizontalSelectionHint">
+                                    <Storyboard>
+                                        <SwipeHintThemeAnimation TargetName="ContentBorder" ToHorizontalOffset="-23" ToVerticalOffset="0" />
+                                        <SwipeHintThemeAnimation TargetName="SelectedLeftIndicator" ToHorizontalOffset="-23" ToVerticalOffset="0" />
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="HintGlyph"
+                                                                       Storyboard.TargetProperty="Opacity"
+                                                                       Duration="0:0:0.500">
+                                            <DiscreteDoubleKeyFrame Value="0.5" KeyTime="0:0:0" />
+                                            <DiscreteDoubleKeyFrame Value="0" KeyTime="0:0:0.500" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="NoSelectionHint" />
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition To="NoSelectionHint" GeneratedDuration="0:0:0.65"/>
+                                </VisualStateGroup.Transitions>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="SelectionStates">
+                                <VisualState x:Name="Unselecting">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="HintGlyphBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unselected">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="HintGlyphBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="UnselectedPointerOver">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="HintGlyphBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ListViewItemSelectedForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="UnselectedSwiping">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="SelectingGlyph"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="0.5" />
+                                        <DoubleAnimation Storyboard.TargetName="HintGlyphBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Selecting">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="SelectedLeftIndicator"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="SelectingGlyph"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="HintGlyphBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ListViewItemSelectedForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Selected">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="SelectedLeftIndicator"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ListViewItemSelectedForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="SelectedSwiping">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="SelectedLeftIndicator"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ListViewItemSelectedForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="SelectedUnfocused">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="SelectedLeftIndicator"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ListViewItemSelectedForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="DragStates">
+                                <VisualState x:Name="NotDragging" />
+                                <VisualState x:Name="Dragging">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="InnerDragContent"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                        <DragItemThemeAnimation TargetName="InnerDragContent" />
+                                        <FadeOutThemeAnimation TargetName="SelectedLeftIndicator" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="DraggingTarget">
+                                    <Storyboard>
+                                        <DropTargetItemThemeAnimation TargetName="OuterContainer" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="MultipleDraggingPrimary">
+                                    <Storyboard>
+                                        <!-- These two Opacity animations are required - the FadeInThemeAnimations
+                                             on the same elements animate an internal Opacity. -->
+                                        <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayBackground"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="1" />
+
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                        <FadeInThemeAnimation TargetName="MultiArrangeOverlayBackground" />
+                                        <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
+                                        <DragItemThemeAnimation TargetName="ContentBorder" />
+                                        <FadeOutThemeAnimation TargetName="SelectedLeftIndicator" />
+                                        <FadeOutThemeAnimation TargetName="PointerOverBorder" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="MultipleDraggingSecondary">
+                                    <Storyboard>
+                                        <FadeOutThemeAnimation TargetName="ContentContainer" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition To="NotDragging" GeneratedDuration="0:0:0.2"/>
+                                </VisualStateGroup.Transitions>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="ReorderHintStates">
+                                <VisualState x:Name="NoReorderHint"/>
+                                <VisualState x:Name="BottomReorderHint">
+                                    <Storyboard>
+                                        <DragOverThemeAnimation TargetName="ReorderHintContent" ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}" Direction="Bottom" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="TopReorderHint">
+                                    <Storyboard>
+                                        <DragOverThemeAnimation TargetName="ReorderHintContent" ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}" Direction="Top" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="RightReorderHint">
+                                    <Storyboard>
+                                        <DragOverThemeAnimation TargetName="ReorderHintContent" ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}" Direction="Right" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="LeftReorderHint">
+                                    <Storyboard>
+                                        <DragOverThemeAnimation TargetName="ReorderHintContent" ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}" Direction="Left" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition To="NoReorderHint" GeneratedDuration="0:0:0.2"/>
+                                </VisualStateGroup.Transitions>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="DataVirtualizationStates">
+                                <VisualState x:Name="DataAvailable"/>
+                                <VisualState x:Name="DataPlaceholder">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock"
+                                                                       Storyboard.TargetProperty="Visibility"
+                                                                       Duration="0">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderRect"
+                                                                       Storyboard.TargetProperty="Visibility"
+                                                                       Duration="0">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Grid x:Name="ReorderHintContent" Background="Transparent">
+                            <Path x:Name="SelectingGlyph" Opacity="0" Data="F1 M133.1,17.9 L137.2,13.2 L144.6,19.6 L156.4,5.8 L161.2,9.9 L145.6,28.4 z" Fill="{ThemeResource ListViewItemCheckSelectingThemeBrush}" Height="13" Stretch="Fill" Width="15" HorizontalAlignment="Right" Margin="0,9.5,9.5,0" VerticalAlignment="Top" FlowDirection="LeftToRight"/>
+                            <Border x:Name="HintGlyphBorder"
+                                    Height="40"
+                                    Width="40"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Top"
+                                    Opacity="0"
+                                    Margin="4">
+                                <Path x:Name="HintGlyph" Opacity="0" Data="F1 M133.1,17.9 L137.2,13.2 L144.6,19.6 L156.4,5.8 L161.2,9.9 L145.6,28.4 z" Fill="{ThemeResource ListViewItemCheckHintThemeBrush}" Height="13" Stretch="Fill"  Width="15" HorizontalAlignment="Right" Margin="0,5.5,5.5,0" VerticalAlignment="Top" FlowDirection="LeftToRight"/>
+                            </Border>
+                            <Border x:Name="ContentContainer">
+                                <Grid x:Name="InnerDragContent">
+                                    <Rectangle x:Name="PointerOverBorder"
+                                               IsHitTestVisible="False"
+                                               Opacity="0"
+                                               Fill="{ThemeResource ListViewItemPointerOverBackgroundThemeBrush}" 
+                                               Margin="0" />
+                                    <Rectangle x:Name="FocusVisual"
+                                               IsHitTestVisible="False"
+                                               Opacity="0"
+                                               StrokeThickness="2"
+                                               Stroke="{ThemeResource ListViewItemFocusBorderThemeBrush}" />
+                                    <Rectangle x:Name="SelectionBackground"
+                                               Margin="0"
+                                               Fill="{ThemeResource ListViewItemSelectedBackgroundThemeBrush}"
+                                               Opacity="0" />
+                                    <Border x:Name="ContentBorder"
+                                            Background="{TemplateBinding Background}"
+                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                            Margin="0">
+                                        <Grid>
+                                            <ContentPresenter x:Name="contentPresenter"
+                                                              ContentTransitions="{TemplateBinding ContentTransitions}"
+                                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                              Content="{TemplateBinding Content}"
+                                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                              Margin="{TemplateBinding Padding}" />
+                                            <!-- The 'Xg' text simulates the amount of space one line of text will occupy.
+                                                 In the DataPlaceholder state, the Content is not loaded yet so we
+                                                 approximate the size of the item using placeholder text. -->
+                                            <TextBlock x:Name="PlaceholderTextBlock"
+                                                       Opacity="0"
+                                                       Text="Xg"
+                                                       Foreground="{x:Null}"
+                                                       Margin="{TemplateBinding Padding}"
+                                                       IsHitTestVisible="False"
+                                                       AutomationProperties.AccessibilityView="Raw"/>
+                                            <Rectangle x:Name="PlaceholderRect"
+                                                       Visibility="Collapsed"
+                                                       Fill="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}"/>
+                                            <Rectangle x:Name="MultiArrangeOverlayBackground"
+                                                       IsHitTestVisible="False"
+                                                       Opacity="0"
+                                                       Fill="{ThemeResource ListViewItemDragBackgroundThemeBrush}" />
+                                        </Grid>
+                                    </Border>
+                                    <Border x:Name="SelectedLeftIndicator"
+                                            BorderBrush="{ThemeResource ListViewItemSelectedBackgroundThemeBrush}"
+                                            BorderThickness="5,0,0,0"
+                                            Opacity="0"/>
+                                    <Rectangle x:Name="SelectedBorder"
+                                               IsHitTestVisible="False"
+                                               Opacity="0"
+                                               Stroke="{ThemeResource ListViewItemSelectedBackgroundThemeBrush}"
+                                               StrokeThickness="{ThemeResource ListViewItemSelectedBorderThemeThickness}"
+                                               Margin="0" />
+                                    <Border x:Name="SelectedCheckMarkOuter"
+                                            IsHitTestVisible="False"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Top"
+                                            Margin="4">
+                                        <Grid x:Name="SelectedCheckMark" Opacity="0" Height="40" Width="40">
+                                            <Path x:Name="SelectedEarmark" Data="M0,0 L40,0 L40,40 z"  Fill="{ThemeResource ListViewItemSelectedBackgroundThemeBrush}" Stretch="Fill"/>
+                                            <Path Data="F1 M133.1,17.9 L137.2,13.2 L144.6,19.6 L156.4,5.8 L161.2,9.9 L145.6,28.4 z" Fill="{ThemeResource ListViewItemCheckThemeBrush}" Height="13" Stretch="Fill" Width="15" HorizontalAlignment="Right" Margin="0,5.5,5.5,0" VerticalAlignment="Top" FlowDirection="LeftToRight"/>
+                                        </Grid>
+                                    </Border>
+                                    <TextBlock x:Name="MultiArrangeOverlayText"
+                                               Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DragItemsCount}"
+                                               Foreground="{ThemeResource ListViewItemDragForegroundThemeBrush}"
+                                               FontFamily="{ThemeResource ContentControlThemeFontFamily}"
+                                               FontSize="26.667"
+                                               IsHitTestVisible="False"
+                                               Opacity="0"
+                                               TextWrapping="Wrap"
+                                               TextTrimming="WordEllipsis"
+                                               Margin="18,9,0,0"
+                                               AutomationProperties.AccessibilityView="Raw"/>
+                                </Grid>
+                            </Border>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>

ModernKeePass/Styles/NoBorderButtonStyle.xaml

@@ -0,0 +1,116 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:ModernKeePass.Styles">
+    <!-- Default style for Windows.UI.Xaml.Controls.Button -->
+    <Style TargetType="Button" x:Key="NoBorderButtonStyle">
+        <Setter Property="Background" Value="{ThemeResource ButtonBackgroundThemeBrush}" />
+        <Setter Property="Foreground" Value="{ThemeResource ButtonForegroundThemeBrush}"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderThemeBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
+        <Setter Property="Padding" Value="12,4,12,4" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Border"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonPointerOverBackgroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonPointerOverForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Border"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonPressedBackgroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonPressedForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Border"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonDisabledBackgroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Border"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonDisabledBorderThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonDisabledForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="FocusVisualWhite"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="FocusVisualBlack"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Margin="0">
+                            <ContentPresenter x:Name="ContentPresenter"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTransitions="{TemplateBinding ContentTransitions}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              Margin="{TemplateBinding Padding}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
+                                              AutomationProperties.AccessibilityView="Raw"/>
+                        </Border>
+                        <Rectangle x:Name="FocusVisualWhite"
+                                   IsHitTestVisible="False"
+                                   Stroke="{ThemeResource FocusVisualWhiteStrokeThemeBrush}"
+                                   StrokeEndLineCap="Square"
+                                   StrokeDashArray="1,1"
+                                   Opacity="0"
+                                   StrokeDashOffset="1.5" />
+                        <Rectangle x:Name="FocusVisualBlack"
+                                   IsHitTestVisible="False"
+                                   Stroke="{ThemeResource FocusVisualBlackStrokeThemeBrush}"
+                                   StrokeEndLineCap="Square"
+                                   StrokeDashArray="1,1"
+                                   Opacity="0"
+                                   StrokeDashOffset="0.5" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

ModernKeePass/Styles/TextBoxWithButtonStyle.xaml

@@ -0,0 +1,231 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:ModernKeePass.Controls">
+
+    <Style TargetType="controls:TextBoxWithButton" x:Name="TextBoxWithButtonStyle">
+        <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
+        <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
+        <Setter Property="Foreground" Value="{ThemeResource TextBoxForegroundThemeBrush}" />
+        <Setter Property="Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource TextBoxBorderThemeBrush}" />
+        <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextSelectionHighlightColorThemeBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
+        <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:TextBoxWithButton">
+                    <Grid>
+                        <Grid.Resources>
+                            <Style x:Name="ActionButtonStyle" TargetType="Button">
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="Button">
+                                            <Grid>
+                                                <VisualStateManager.VisualStateGroups>
+                                                    <VisualStateGroup x:Name="CommonStates">
+                                                        <VisualState x:Name="Normal" />
+                                                        <VisualState x:Name="PointerOver">
+                                                            <Storyboard>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
+                                                                                               Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBackgroundThemeBrush}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                                               Storyboard.TargetProperty="BorderBrush">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBorderThemeBrush}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
+                                                                                               Storyboard.TargetProperty="Foreground">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverForegroundThemeBrush}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
+                                                        </VisualState>
+                                                        <VisualState x:Name="Pressed">
+                                                            <Storyboard>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
+                                                                                               Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBackgroundThemeBrush}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                                               Storyboard.TargetProperty="BorderBrush">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
+                                                                                               Storyboard.TargetProperty="Foreground">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedForegroundThemeBrush}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
+                                                        </VisualState>
+                                                        <VisualState x:Name="Disabled">
+                                                            <Storyboard>
+                                                                <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                                                 Storyboard.TargetProperty="Opacity"
+                                                                                 To="0"
+                                                                                 Duration="0" />
+                                                                <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                                                 Storyboard.TargetProperty="Opacity"
+                                                                                 To="0"
+                                                                                 Duration="0" />
+                                                            </Storyboard>
+                                                        </VisualState>
+                                                    </VisualStateGroup>
+                                                </VisualStateManager.VisualStateGroups>
+                                                <Border x:Name="BorderElement"
+                                                        BorderBrush="{ThemeResource TextBoxButtonBorderThemeBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"/>
+                                                <Border x:Name="BackgroundElement"
+                                                        Background="{ThemeResource TextBoxButtonBackgroundThemeBrush}"
+                                                        Margin="{TemplateBinding BorderThickness}">
+                                                <TextBlock x:Name="GlyphElement"
+                                                            Foreground="{ThemeResource TextBoxButtonForegroundThemeBrush}"
+                                                            Padding="4,0,4,0"
+                                                            VerticalAlignment="Center"
+                                                            HorizontalAlignment="Center"
+                                                            FontStyle="Normal"
+                                                            Text="{TemplateBinding Content}"
+                                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                            AutomationProperties.AccessibilityView="Raw"/>
+                                                </Border>
+                                            </Grid>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </Grid.Resources>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBackgroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBorderThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Normal">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource TextControlBackgroundThemeOpacity}" />
+                                        <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource TextControlBorderThemeOpacity}" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource TextControlPointerOverBackgroundThemeOpacity}" />
+                                        <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         Duration="0"
+                                                         To="{ThemeResource TextControlPointerOverBorderThemeOpacity}" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Focused" />
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="ButtonStates">
+                                <VisualState x:Name="ButtonVisible">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton"
+                                                                       Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="ButtonCollapsed" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Border x:Name="BackgroundElement"
+                                Grid.Row="1"
+                                Background="{TemplateBinding Background}"
+                                Margin="{TemplateBinding BorderThickness}"
+                                Grid.ColumnSpan="2"
+                                Grid.RowSpan="1"/>
+                        <Border x:Name="BorderElement"
+                                Grid.Row="1"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Grid.ColumnSpan="2"
+                                Grid.RowSpan="1"/>
+                        <ContentPresenter x:Name="HeaderContentPresenter"
+                                          Grid.Row="0"
+                                          Foreground="{ThemeResource TextBoxForegroundHeaderThemeBrush}"
+                                          Margin="0,4,0,4"
+                                          Grid.ColumnSpan="2"
+                                          Content="{TemplateBinding Header}"
+                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                          FontWeight="Semilight" />
+                        <ScrollViewer x:Name="ContentElement"
+                                      Grid.Row="1"
+                                      HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                      VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                      IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+                                      IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+                                      IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                      Margin="{TemplateBinding BorderThickness}"
+                                      Padding="{TemplateBinding Padding}"
+                                      IsTabStop="False"
+                                      AutomationProperties.AccessibilityView="Raw"
+                                      ZoomMode="Disabled" />
+                        <ContentControl x:Name="PlaceholderTextContentPresenter"
+                                      Grid.Row="1"
+                                      Foreground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"
+                                      Margin="{TemplateBinding BorderThickness}"
+                                      Padding="{TemplateBinding Padding}"
+                                      IsTabStop="False"
+                                      Grid.ColumnSpan="2"
+                                      Content="{TemplateBinding PlaceholderText}" 
+                                      IsHitTestVisible="False"/>
+                        <Button x:Name="ActionButton"
+                                Grid.Row="1"
+                                Style="{StaticResource ActionButtonStyle}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsTabStop="False"
+                                Grid.Column="1"
+                                Visibility="Collapsed"
+                                FontSize="{TemplateBinding FontSize}"
+                                Content="{TemplateBinding ButtonSymbol}"
+                                VerticalAlignment="Stretch"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>

ModernKeePass/TemplateSelectors/FirstItemDataTemplateSelector.cs

@@ -0,0 +1,18 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace ModernKeePass.TemplateSelectors
+{
+    public class FirstItemDataTemplateSelector: DataTemplateSelector
+    {
+        public DataTemplate FirstItem { get; set; }
+        public DataTemplate OtherItem { get; set; }
+
+        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+        {
+            var itemsControl = ItemsControl.ItemsControlFromItemContainer(container);
+            var returnTemplate = itemsControl.IndexFromContainer(container) == 0 ? FirstItem : OtherItem;
+            return returnTemplate;
+        }
+    }
+}

ModernKeePass/ViewModels/AboutVm.cs

@@ -0,0 +1,20 @@
+using Windows.ApplicationModel;
+
+namespace ModernKeePass.ViewModels
+{
+    public class AboutVm
+    {
+        public string Name { get; } = Package.Current.DisplayName;
+
+        public string Version
+        {
+            get
+            {
+                var package = Package.Current;
+                var version = package.Id.Version;
+
+                return $"{version.Major}.{version.Minor}";
+            }
+        }
+    }
+}

ModernKeePass/ViewModels/CompositeKeyVm.cs

@@ -0,0 +1,113 @@
+using Windows.Storage;
+using Windows.UI.Xaml;
+using ModernKeePass.Common;
+using ModernKeePassLib.Cryptography;
+using ModernKeePassLib.Keys;
+using ModernKeePassLib.Serialization;
+
+namespace ModernKeePass.ViewModels
+{
+    public class CompositeKeyVm: NotifyPropertyChangedBase
+    {
+        public enum StatusTypes
+        {
+            Normal = 0,
+            Error = 1,
+            Warning = 3,
+            Success = 5
+        }
+
+        private readonly App _app = Application.Current as App;
+        private bool _hasPassword;
+        private bool _hasKeyFile;
+        private string _password = string.Empty;
+        private string _status;
+        private StatusTypes _statusType;
+        private StorageFile _keyFile;
+
+        public bool HasPassword
+        {
+            get { return _hasPassword; }
+            set
+            {
+                SetProperty(ref _hasPassword, value);
+                OnPropertyChanged("IsValid");
+            }
+        }
+
+        public bool HasKeyFile
+        {
+            get { return _hasKeyFile; }
+            set
+            {
+                SetProperty(ref _hasKeyFile, value);
+                OnPropertyChanged("IsValid");
+            }
+        }
+
+        public bool IsValid => HasPassword || HasKeyFile;
+
+        public string Status
+        {
+            get { return _status; }
+            set { SetProperty(ref _status, value); }
+        }
+
+        public int StatusType
+        {
+            get { return (int)_statusType; }
+            set { SetProperty(ref _statusType, (StatusTypes)value); }
+        }
+
+        public string Password
+        {
+            get { return _password; }
+            set
+            {
+                _password = value;
+                OnPropertyChanged("PasswordComplexityIndicator");
+                StatusType = (int)StatusTypes.Normal;
+            }
+        }
+
+        public StorageFile KeyFile
+        {
+            get { return _keyFile; }
+            set
+            {
+                _keyFile = value;
+                UpdateStatus($"Key file: {value.Name}", StatusTypes.Normal);
+            }
+        }
+
+        public GroupVm RootGroup { get; set; }
+        public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password?.ToCharArray());
+        
+        public DatabaseHelper.DatabaseStatus OpenDatabase(bool createNew)
+        {
+            UpdateStatus(_app.Database.Open(CreateCompositeKey(), createNew), StatusTypes.Error);
+            RootGroup = _app.Database.RootGroup;
+            return _app.Database.Status;
+        }
+
+        public void UpdateKey()
+        {
+            _app.Database.UpdateCompositeKey(CreateCompositeKey());
+            UpdateStatus("Database composite key updated.", StatusTypes.Success);
+        }
+
+        private void UpdateStatus(string text, StatusTypes type)
+        {
+            Status = text;
+            StatusType = (int)type;
+        }
+
+        private CompositeKey CreateCompositeKey()
+        {
+            var compositeKey = new CompositeKey();
+            if (HasPassword) compositeKey.AddUserKey(new KcpPassword(Password));
+            if (HasKeyFile) compositeKey.AddUserKey(new KcpKeyFile(IOConnectionInfo.FromFile(KeyFile)));
+            return compositeKey;
+        }
+    }
+}

ModernKeePass/ViewModels/DatabaseVm.cs

@@ -1,69 +0,0 @@
-using System.ComponentModel;
-using Windows.Storage;
-
-using ModernKeePassLib;
-using ModernKeePassLib.Keys;
-using ModernKeePassLib.Serialization;
-using ModernKeePassLib.Interfaces;
-using Windows.UI.Xaml;
-using System;
-
-namespace ModernKeePass.ViewModels
-{
-    public class DatabaseVm : INotifyPropertyChanged
-    {
-        private PwDatabase database = new PwDatabase();
-        private StorageFile databaseFile;
-
-        public string Password { get; set; }
-        public bool IsOpen { get; set; }
-        public Visibility Visibility { get; private set; }
-        public string ErrorMessage { get; set; }
-        public string Name { get; set; }
-        public GroupVm RootGroup { get; set; }
-
-
-        public DatabaseVm()
-        {
-            Visibility = Visibility.Collapsed;
-        }
-        public DatabaseVm(StorageFile databaseFile)
-        {
-            this.databaseFile = databaseFile;
-            Visibility = Visibility.Visible;
-        }
-        public async void Open()
-        {
-            var key = new CompositeKey();
-            try
-            {
-                key.AddUserKey(new KcpPassword(Password));
-                await database.Open(IOConnectionInfo.FromFile(databaseFile), key, new NullStatusLogger());
-                IsOpen = database.IsOpen;
-                Name = databaseFile.DisplayName;
-                RootGroup = new GroupVm (database.RootGroup);
-            }
-            catch (ArgumentNullException)
-            {
-                ErrorMessage = "Password cannot be empty";
-                NotifyPropertyChanged("ErrorMessage");
-            }
-            catch (InvalidCompositeKeyException)
-            {
-                ErrorMessage = "Wrong password";
-                NotifyPropertyChanged("ErrorMessage");
-            }
-            finally
-            {
-                // TODO: move this when implementing write mode
-                database.Close();
-            }
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        public void NotifyPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
-}

ModernKeePass/ViewModels/EntryVm.cs

@@ -1,26 +1,248 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
+using System.Text;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Interfaces;
+using ModernKeePass.Mappings;
 using ModernKeePassLib;
+using ModernKeePassLib.Cryptography.PasswordGenerator;
+using ModernKeePassLib.Security;
+using ModernKeePassLib.Cryptography;
 
 namespace ModernKeePass.ViewModels
 {
-    public class EntryVm : INotifyPropertyChanged
+    public class EntryVm : INotifyPropertyChanged, IPwEntity
     {
-        public string Title { get; private set; }
-        public string UserName { get; private set; }
-        public string Password { get; private set; }
-        public string URL { get; private set; }
-        public string Notes { get; private set; }
+        public GroupVm ParentGroup { get; private set; }
 
-        public EntryVm() { }
-        public EntryVm(PwEntry entry)
+        public GroupVm PreviousGroup { get; private set; }
+
+        public System.Drawing.Color? BackgroundColor => _pwEntry?.BackgroundColor;
+        public System.Drawing.Color? ForegroundColor => _pwEntry?.ForegroundColor;
+        public bool IsRevealPasswordEnabled => !string.IsNullOrEmpty(Password);
+        public bool HasExpired => HasExpirationDate && _pwEntry.ExpiryTime < DateTime.Now;
+        public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password.ToCharArray());
+        public bool IsFirstItem => _pwEntry == null;
+
+
+        public bool UpperCasePatternSelected { get; set; } = true;
+        public bool LowerCasePatternSelected { get; set; } = true;
+        public bool DigitsPatternSelected { get; set; } = true;
+        public bool MinusPatternSelected { get; set; }
+        public bool UnderscorePatternSelected { get; set; }
+        public bool SpacePatternSelected { get; set; }
+        public bool SpecialPatternSelected { get; set; }
+        public bool BracketsPatternSelected { get; set; }
+        public string CustomChars { get; set; } = string.Empty;
+        public PwUuid IdUuid => _pwEntry?.Uuid;
+
+        public double PasswordLength
         {
-            Title = entry.Strings.GetSafe(PwDefs.TitleField).ReadString();
-            UserName = entry.Strings.GetSafe(PwDefs.UserNameField).ReadString();
-            Password = entry.Strings.GetSafe(PwDefs.PasswordField).ReadString();
-            URL = entry.Strings.GetSafe(PwDefs.UrlField).ReadString();
-            Notes = entry.Strings.GetSafe(PwDefs.NotesField).ReadString();
+            get { return _passwordLength; }
+            set
+            {
+                _passwordLength = value;
+                NotifyPropertyChanged("PasswordLength");
+            }
+        }
+        public string Name
+        {
+            get
+            {
+                var title = GetEntryValue(PwDefs.TitleField);
+                return title == null ? "< New entry >" : title;
+            }
+            set { SetEntryValue(PwDefs.TitleField, value); }
+        }
+
+        public string Id => _pwEntry?.Uuid.ToHexString();
+
+        public string UserName
+        {
+            get { return GetEntryValue(PwDefs.UserNameField); }
+            set { SetEntryValue(PwDefs.UserNameField, value); }
+        }
+
+        public string Password
+        {
+            get { return GetEntryValue(PwDefs.PasswordField); }
+            set
+            {
+                SetEntryValue(PwDefs.PasswordField, value);
+                NotifyPropertyChanged("Password");
+                NotifyPropertyChanged("PasswordComplexityIndicator");
+            }
+        }
+        public string Url
+        {
+            get { return GetEntryValue(PwDefs.UrlField); }
+            set { SetEntryValue(PwDefs.UrlField, value); }
+        }
+        public string Notes
+        {
+            get { return GetEntryValue(PwDefs.NotesField); }
+            set { SetEntryValue(PwDefs.NotesField, value); }
+        }
+
+        public Symbol IconSymbol
+        {
+            get
+            {
+                if (_pwEntry == null) return Symbol.Add;
+                if (HasExpired) return Symbol.Priority;
+                var result = PwIconToSegoeMapping.GetSymbolFromIcon(_pwEntry.IconId);
+                return result == Symbol.More ? Symbol.Permissions : result;
+            }
+        }
+
+        public DateTimeOffset ExpiryDate
+        {
+            get { return new DateTimeOffset(_pwEntry.ExpiryTime.Date); }
+            set { if (HasExpirationDate) _pwEntry.ExpiryTime = value.DateTime; }
+        }
+
+        public TimeSpan ExpiryTime
+        {
+            get { return _pwEntry.ExpiryTime.TimeOfDay; }
+            set { if (HasExpirationDate) _pwEntry.ExpiryTime = _pwEntry.ExpiryTime.Date.Add(value); }
+        }
+
+        public bool IsEditMode
+        {
+            get { return _isEditMode; }
+            set
+            {
+                _isEditMode = value;
+                NotifyPropertyChanged("IsEditMode");
+            }
+        }
+
+        public bool IsRevealPassword
+        {
+            get { return _isRevealPassword; }
+            set
+            {
+                _isRevealPassword = value;
+                NotifyPropertyChanged("IsRevealPassword");
+            }
+        }
+        public bool HasExpirationDate
+        {
+            get { return _pwEntry.Expires; }
+            set
+            {
+                _pwEntry.Expires = value;
+                NotifyPropertyChanged("HasExpirationDate");
+            }
+        }
+
+        public string Path
+        {
+            get
+            {
+                var path = new StringBuilder(ParentGroup.Path);
+                path.Append($" > {ParentGroup.Name}");
+                return path.ToString();
+            }
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
+
+        private readonly PwEntry _pwEntry;
+        private readonly App _app = Application.Current as App;
+        private bool _isEditMode;
+        private bool _isRevealPassword;
+        private double _passwordLength = 25;
+
+        private void NotifyPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public EntryVm() { }
+        public EntryVm(PwEntry entry, GroupVm parent)
+        {
+            _pwEntry = entry;
+            ParentGroup = parent;
+        }
+        
+        public void GeneratePassword()
+        {
+            var pwProfile = new PwProfile()
+            {
+                GeneratorType = PasswordGeneratorType.CharSet,
+                Length = (uint)PasswordLength,
+                CharSet = new PwCharSet()
+            };
+
+            if (UpperCasePatternSelected) pwProfile.CharSet.Add(PwCharSet.UpperCase);
+            if (LowerCasePatternSelected) pwProfile.CharSet.Add(PwCharSet.LowerCase);
+            if (DigitsPatternSelected) pwProfile.CharSet.Add(PwCharSet.Digits);
+            if (SpecialPatternSelected) pwProfile.CharSet.Add(PwCharSet.SpecialChars);
+            if (MinusPatternSelected) pwProfile.CharSet.Add('-');
+            if (UnderscorePatternSelected) pwProfile.CharSet.Add('_');
+            if (SpacePatternSelected) pwProfile.CharSet.Add(' ');
+            if (BracketsPatternSelected) pwProfile.CharSet.Add(PwCharSet.Brackets);
+
+            pwProfile.CharSet.Add(CustomChars);
+
+            ProtectedString password;
+            PwGenerator.Generate(out password, pwProfile, null, new CustomPwGeneratorPool());
+
+            _pwEntry?.Strings.Set(PwDefs.PasswordField, password);
+            NotifyPropertyChanged("Password");
+            NotifyPropertyChanged("IsRevealPasswordEnabled");
+            NotifyPropertyChanged("PasswordComplexityIndicator");
+        }
+
+        private string GetEntryValue(string key)
+        {
+            return _pwEntry?.Strings.GetSafe(key).ReadString();
+        }
+        
+        private void SetEntryValue(string key, string newValue)
+        {
+            _pwEntry?.Strings.Set(key, new ProtectedString(true, newValue));
+        }
+        
+        public void MarkForDelete()
+        {
+            if (_app.Database.RecycleBinEnabled && _app.Database.RecycleBin?.IdUuid == null)
+                _app.Database.CreateRecycleBin();
+            Move(_app.Database.RecycleBinEnabled && !ParentGroup.IsSelected ? _app.Database.RecycleBin : null);
+        }
+
+        public void UndoDelete()
+        {
+            Move(PreviousGroup);
+        }
+
+        public void Move(GroupVm destination)
+        {
+            PreviousGroup = ParentGroup;
+            PreviousGroup.Entries.Remove(this);
+            PreviousGroup.RemovePwEntry(_pwEntry);
+            if (destination == null)
+            {
+                _app.Database.AddDeletedItem(IdUuid);
+                return;
+            }
+            ParentGroup = destination;
+            ParentGroup.Entries.Add(this);
+            ParentGroup.AddPwEntry(_pwEntry);
+        }
+        
+        public void CommitDelete()
+        {
+            _pwEntry.ParentGroup.Entries.Remove(_pwEntry);
+            if (_app.Database.RecycleBinEnabled && !PreviousGroup.IsSelected) _app.Database.RecycleBin.AddPwEntry(_pwEntry);
+            else _app.Database.AddDeletedItem(IdUuid);
+        }
+
+        public void Save()
+        {
+            _app.Database.Save();
+        }
     }
 }

ModernKeePass/ViewModels/GroupVm.cs

@@ -1,50 +1,179 @@
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Linq;
+using System.Text;
+using Windows.UI.Text;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
+using ModernKeePass.Mappings;
 using ModernKeePassLib;
 
 namespace ModernKeePass.ViewModels
 {
-    public class GroupVm : INotifyPropertyChanged
+    public class GroupVm : NotifyPropertyChangedBase, IPwEntity, ISelectableModel
     {
-        public ObservableCollection<EntryVm> Entries { get; set; }
-        public ObservableCollection<GroupVm> Groups { get; set; }
-        public string Name { get; set; }
+        public GroupVm ParentGroup { get; private set; }
+        public GroupVm PreviousGroup { get; private set; }
+        public ObservableCollection<EntryVm> Entries { get; set; } = new ObservableCollection<EntryVm>();
         
-        public string EntryCount {
-            get
-            {
-                return $"{Entries?.Count} entries.";
-            }
-        }
-        public string GroupCount
+        public ObservableCollection<GroupVm> Groups { get; set; } = new ObservableCollection<GroupVm>();
+
+        public int EntryCount => Entries.Count() - 1;
+        public FontWeight FontWeight => _pwGroup == null ? FontWeights.Bold : FontWeights.Normal;
+        public int GroupCount => Groups.Count - 1;
+        public PwUuid IdUuid => _pwGroup?.Uuid;
+        public string Id => IdUuid?.ToHexString();
+        public bool IsNotRoot => ParentGroup != null;
+
+        public bool ShowRestore => IsNotRoot && ParentGroup.IsSelected;
+        /// <summary>
+        /// Is the Group the database Recycle Bin?
+        /// </summary>
+        public bool IsSelected
         {
-            get
+            get { return _app.Database.RecycleBinEnabled && _app.Database.RecycleBin?.Id == Id; }
+            set
             {
-                return $"{Groups?.Count} groups.";
+                if (value && _pwGroup != null) _app.Database.RecycleBin = this;
+                /*else if (value && _pwGroup == null)
+                {
+                    var recycleBin = _app.Database.RootGroup.AddNewGroup("Recycle bin");
+                    recycleBin.IsSelected = true;
+                    recycleBin.IconSymbol = Symbol.Delete;
+                }*/
             }
         }
 
-        public GroupVm()
-        {
-            Name = "GroupName";
-            Entries = new ObservableCollection<EntryVm>();
-            Groups = new ObservableCollection<GroupVm>();
+        public IOrderedEnumerable<IGrouping<char, EntryVm>> EntriesZoomedOut => from e in Entries
+            where !e.IsFirstItem
+            group e by e.Name.FirstOrDefault() into grp
+            orderby grp.Key
+            select grp;
 
+        public string Name
+        {
+            get { return _pwGroup == null ? "< New group >" : _pwGroup.Name; }
+            set { _pwGroup.Name = value; }
         }
 
-        public GroupVm(PwGroup group)
+        public Symbol IconSymbol
         {
-            Name = group.Name;
-            Entries = new ObservableCollection<EntryVm>(group.Entries.Select(e => new EntryVm(e)));
-            Groups = new ObservableCollection<GroupVm>(group.Groups.Select(g => new GroupVm(g)));
+            get
+            {
+                if (_pwGroup == null) return Symbol.Add;
+                var result = PwIconToSegoeMapping.GetSymbolFromIcon(_pwGroup.IconId);
+                return result == Symbol.More ? Symbol.Folder : result;
+            }
+            set { _pwGroup.IconId = PwIconToSegoeMapping.GetIconFromSymbol(value); }
         }
         
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        public void NotifyPropertyChanged(string propertyName)
+        public bool IsEditMode
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            get { return _isEditMode; }
+            set { SetProperty(ref _isEditMode, value); }
+        }
+
+        public string Path
+        {
+            get
+            {
+                if (ParentGroup == null) return string.Empty;
+                var path = new StringBuilder(ParentGroup.Path);
+                path.Append($" > {ParentGroup.Name}");
+                return path.ToString();
+            }
+        }
+
+        private readonly PwGroup _pwGroup;
+        private readonly App _app = Application.Current as App;
+        private bool _isEditMode;
+
+        public GroupVm() {}
+
+        public GroupVm(PwGroup pwGroup, GroupVm parent, PwUuid recycleBinId = null)
+        {
+            _pwGroup = pwGroup;
+            ParentGroup = parent;
+
+            if (recycleBinId != null && _pwGroup.Uuid.Equals(recycleBinId)) _app.Database.RecycleBin = this;
+            Entries = new ObservableCollection<EntryVm>(pwGroup.Entries.Select(e => new EntryVm(e, this)).OrderBy(e => e.Name));
+            Entries.Insert(0, new EntryVm ());
+            Groups = new ObservableCollection<GroupVm>(pwGroup.Groups.Select(g => new GroupVm(g, this, recycleBinId)).OrderBy(g => g.Name));
+            Groups.Insert(0, new GroupVm ());
+        }
+
+        public GroupVm AddNewGroup(string name = "")
+        {
+            var pwGroup = new PwGroup(true, true, name, PwIcon.Folder);
+            _pwGroup.AddGroup(pwGroup, true);
+            var newGroup = new GroupVm(pwGroup, this) {Name = name, IsEditMode = string.IsNullOrEmpty(name)};
+            Groups.Add(newGroup);
+            return newGroup;
+        }
+        
+        public EntryVm AddNewEntry()
+        {
+            var pwEntry = new PwEntry(true, true);
+            _pwGroup.AddEntry(pwEntry, true);
+            var newEntry = new EntryVm(pwEntry, this) {IsEditMode = true};
+            Entries.Add(newEntry);
+            return newEntry;
+        }
+
+        public void AddPwEntry(PwEntry entry)
+        {
+            _pwGroup.AddEntry(entry, true);
+        }
+
+        public void RemovePwEntry(PwEntry entry)
+        {
+            _pwGroup.Entries.Remove(entry);
+        }
+
+        public void MarkForDelete()
+        {
+            if (_app.Database.RecycleBinEnabled && _app.Database.RecycleBin?.IdUuid == null)
+                _app.Database.CreateRecycleBin();
+            Move(_app.Database.RecycleBinEnabled && !IsSelected ? _app.Database.RecycleBin : null);
+        }
+
+
+        public void UndoDelete()
+        {
+            Move(PreviousGroup);
+        }
+
+        public void Move(GroupVm destination)
+        {
+            PreviousGroup = ParentGroup;
+            PreviousGroup.Groups.Remove(this);
+            PreviousGroup._pwGroup.Groups.Remove(_pwGroup);
+            if (destination == null)
+            {
+                _app.Database.AddDeletedItem(IdUuid);
+                return;
+            }
+            ParentGroup = destination;
+            ParentGroup.Groups.Add(this);
+            ParentGroup._pwGroup.AddGroup(_pwGroup, true);
+        }
+
+        public void CommitDelete()
+        {
+            _pwGroup.ParentGroup.Groups.Remove(_pwGroup);
+            if (_app.Database.RecycleBinEnabled && !PreviousGroup.IsSelected) _app.Database.RecycleBin._pwGroup.AddGroup(_pwGroup, true);
+            else _app.Database.AddDeletedItem(IdUuid);
+        }
+
+        public void Save()
+        {
+            _app.Database.Save();
+        }
+
+        public override string ToString()
+        {
+            return Name;
         }
     }
 }

ModernKeePass/ViewModels/Items/ListMenuItemVm.cs

@@ -0,0 +1,30 @@
+using System;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
+
+namespace ModernKeePass.ViewModels
+{
+    public class ListMenuItemVm : NotifyPropertyChangedBase, IIsEnabled, ISelectableModel
+    {
+        private bool _isSelected;
+
+        public string Title { get; set; }
+        
+        public int Group { get; set; } = 0;
+        public Type PageType { get; set; }
+        public Symbol SymbolIcon { get; set; }
+        public bool IsEnabled { get; set; } = true;
+
+        public bool IsSelected
+        {
+            get { return _isSelected; }
+            set { SetProperty(ref _isSelected, value); }
+        }
+
+        public override string ToString()
+        {
+            return Title;
+        }
+    }
+}

ModernKeePass/ViewModels/Items/MainMenuItemVm.cs

@@ -0,0 +1,10 @@
+using Windows.UI.Xaml.Controls;
+
+namespace ModernKeePass.ViewModels
+{
+    public class MainMenuItemVm: ListMenuItemVm
+    {
+        public object Parameter { get; set; }
+        public Frame Destination { get; set; }
+    }
+}

ModernKeePass/ViewModels/Items/RecentItemVm.cs

@@ -0,0 +1,31 @@
+using Windows.Storage;
+using ModernKeePass.Common;
+using Windows.Storage.AccessCache;
+using ModernKeePass.Interfaces;
+
+namespace ModernKeePass.ViewModels
+{
+    public class RecentItemVm: NotifyPropertyChangedBase, ISelectableModel
+    {
+        private bool _isSelected;
+
+        public RecentItemVm() {}
+        public RecentItemVm(AccessListEntry entry, StorageFile file)
+        {
+            Token = entry.Token;
+            Name = entry.Metadata;
+            DatabaseFile = file;
+        }
+
+        public StorageFile DatabaseFile { get; }
+        public string Token { get; }
+        public string Name { get; }
+        public string Path => DatabaseFile?.Path;
+
+        public bool IsSelected
+        {
+            get { return _isSelected; }
+            set { SetProperty(ref _isSelected, value); }
+        }
+    }
+}

ModernKeePass/ViewModels/Items/SettingsDatabaseVm.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Windows.Storage;
+using Windows.UI.Xaml;
+using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
+using ModernKeePassLib;
+using ModernKeePassLib.Cryptography.Cipher;
+using ModernKeePassLib.Cryptography.KeyDerivation;
+
+namespace ModernKeePass.ViewModels
+{
+    public class SettingsDatabaseVm: NotifyPropertyChangedBase, IHasSelectableObject
+    {
+        private readonly App _app = Application.Current as App;
+        private readonly ApplicationDataContainer _localSettings = ApplicationData.Current.LocalSettings;
+        private GroupVm _selectedItem;
+
+        public bool HasRecycleBin
+        {
+            get { return _app.Database.RecycleBinEnabled; }
+            set
+            {
+                _app.Database.RecycleBinEnabled = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public ObservableCollection<GroupVm> Groups { get; set; }
+
+        public IEnumerable<string> Ciphers
+        {
+            get
+            {
+                for (var inx = 0; inx < CipherPool.GlobalPool.EngineCount; inx++)
+                {
+                    yield return CipherPool.GlobalPool[inx].DisplayName;
+                }
+            }
+        }
+
+        public int CipherIndex
+        {
+            get
+            {
+                for (var inx = 0; inx < CipherPool.GlobalPool.EngineCount; ++inx)
+                {
+                    if (CipherPool.GlobalPool[inx].CipherUuid.Equals(_app.Database.DataCipher)) return inx;
+                }
+                return -1;
+            }
+            set { _app.Database.DataCipher = CipherPool.GlobalPool[value].CipherUuid; }
+        }
+
+        public IEnumerable<string> Compressions => Enum.GetNames(typeof(PwCompressionAlgorithm)).Take((int)PwCompressionAlgorithm.Count);
+
+        public string CompressionName
+        {
+            get { return Enum.GetName(typeof(PwCompressionAlgorithm), _app.Database.CompressionAlgorithm); }
+            set { _app.Database.CompressionAlgorithm = (PwCompressionAlgorithm)Enum.Parse(typeof(PwCompressionAlgorithm), value); }
+        }
+        public IEnumerable<string> KeyDerivations => KdfPool.Engines.Select(e => e.Name);
+
+        public string KeyDerivationName
+        {
+            get { return KdfPool.Get(_app.Database.KeyDerivation.KdfUuid).Name; }
+            set { _app.Database.KeyDerivation = KdfPool.Engines.FirstOrDefault(e => e.Name == value)?.GetDefaultParameters(); } 
+        }
+
+        public ISelectableModel SelectedItem
+        {
+            get { return Groups.FirstOrDefault(g => g.IsSelected); }
+            set
+            {
+                if (_selectedItem == value) return;
+                if (_selectedItem != null)
+                {
+                    _selectedItem.IsSelected = false;
+                }
+
+                SetProperty(ref _selectedItem, (GroupVm)value);
+
+                if (_selectedItem != null)
+                {
+                    _selectedItem.IsSelected = true;
+                }
+            }
+        }
+
+        public SettingsDatabaseVm()
+        {
+            Groups = _app.Database.RootGroup.Groups;
+        }
+
+        // TODO: Move to another setting class (or a static class)
+        private T GetSetting<T>(string property)
+        {
+            try
+            {
+                return (T) Convert.ChangeType(_localSettings.Values[property], typeof(T));
+            }
+            catch (InvalidCastException)
+            {
+                return default(T);
+            }
+        }
+    }
+}

ModernKeePass/ViewModels/MainVm.cs

@@ -0,0 +1,95 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using Windows.ApplicationModel;
+using Windows.Storage.AccessCache;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
+using ModernKeePass.Pages;
+
+namespace ModernKeePass.ViewModels
+{
+    public class MainVm : NotifyPropertyChangedBase, IHasSelectableObject
+    {
+        private IOrderedEnumerable<IGrouping<int, MainMenuItemVm>> _mainMenuItems;
+        private MainMenuItemVm _selectedItem;
+
+        public string Name { get; } = Package.Current.DisplayName;
+
+        public IOrderedEnumerable<IGrouping<int, MainMenuItemVm>> MainMenuItems
+        {
+            get { return _mainMenuItems; }
+            set { SetProperty(ref _mainMenuItems, value); }
+        }
+
+        public ISelectableModel SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                if (_selectedItem == value) return;
+                if (_selectedItem != null)
+                {
+                    _selectedItem.IsSelected = false;
+                }
+
+                SetProperty(ref _selectedItem, (MainMenuItemVm)value);
+
+                if (_selectedItem != null)
+                {
+                    _selectedItem.IsSelected = true;
+                }
+            }
+        }
+
+        public MainVm() {}
+
+        public MainVm(Frame referenceFrame, Frame destinationFrame)
+        {
+            var app = (App)Application.Current;
+            var mru = StorageApplicationPermissions.MostRecentlyUsedList;
+            var isDatabaseOpen = app.Database != null && app.Database.Status == DatabaseHelper.DatabaseStatus.Opened;
+
+            var mainMenuItems = new ObservableCollection<MainMenuItemVm>
+            {
+                new MainMenuItemVm
+                {
+                    Title = "Open", PageType = typeof(OpenDatabasePage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Page2,
+                    IsSelected = app.Database.Status == DatabaseHelper.DatabaseStatus.Opening
+                },
+                new MainMenuItemVm
+                {
+                    Title = "New" , PageType = typeof(NewDatabasePage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Add
+                },
+                new MainMenuItemVm
+                {
+                    Title = "Save" , PageType = typeof(SaveDatabasePage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Save,
+                    IsSelected = isDatabaseOpen, IsEnabled = isDatabaseOpen
+                },
+                new MainMenuItemVm {
+                    Title = "Recent" , PageType = typeof(RecentDatabasesPage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Copy,
+                    IsSelected = (app.Database == null || app.Database.Status == DatabaseHelper.DatabaseStatus.Closed) && mru.Entries.Count > 0, IsEnabled = mru.Entries.Count > 0
+                },
+                new MainMenuItemVm
+                {
+                    Title = "About" , PageType = typeof(AboutPage), Destination = destinationFrame, SymbolIcon = Symbol.Help
+                }
+            };
+            // Auto-select the Recent Items menu item if the conditions are met
+            SelectedItem = mainMenuItems.FirstOrDefault(m => m.IsSelected);
+            if (app.Database != null && app.Database.Status == DatabaseHelper.DatabaseStatus.Opened)
+                mainMenuItems.Add(new MainMenuItemVm
+                {
+                    Title = app.Database.Name,
+                    PageType = typeof(GroupDetailPage),
+                    Destination = referenceFrame,
+                    Parameter = app.Database.RootGroup,
+                    Group = 1,
+                    SymbolIcon = Symbol.ProtectedDocument
+                });
+                
+            MainMenuItems = from item in mainMenuItems group item by item.Group into grp orderby grp.Key select grp;
+        }
+    }
+}

ModernKeePass/ViewModels/NewVm.cs

@@ -0,0 +1,7 @@
+namespace ModernKeePass.ViewModels
+{
+    public class NewVm : OpenVm
+    {
+        public string Password { get; set; }
+    }
+}

ModernKeePass/ViewModels/OpenVm.cs

@@ -0,0 +1,50 @@
+using System.ComponentModel;
+using Windows.Storage;
+using Windows.Storage.AccessCache;
+using Windows.UI.Xaml;
+using ModernKeePass.Common;
+
+namespace ModernKeePass.ViewModels
+{
+    public class OpenVm: INotifyPropertyChanged
+    {
+        public bool ShowPasswordBox
+        {
+            get { return ((App)Application.Current).Database.Status == DatabaseHelper.DatabaseStatus.Opening; }
+        }
+
+        public string Name
+        {
+            get { return ((App)Application.Current).Database.Name; }
+        }
+
+        public OpenVm()
+        {
+            var app = Application.Current as App;
+            if (app?.Database == null || app.Database.Status != DatabaseHelper.DatabaseStatus.Opening) return;
+            OpenFile(app.Database.DatabaseFile);
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        
+        protected void NotifyPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public void OpenFile(StorageFile file)
+        {
+            var database = ((App)Application.Current).Database;
+            database.DatabaseFile = file;
+            NotifyPropertyChanged("Name");
+            NotifyPropertyChanged("ShowPasswordBox");
+            AddToRecentList(file);
+        }
+        
+        private void AddToRecentList(StorageFile file)
+        {
+            var mru = StorageApplicationPermissions.MostRecentlyUsedList;
+            mru.Add(file, file.DisplayName);
+        }
+    }
+}