Version 1.6

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

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,14 +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", "{2E710089-9559-4967-846C-E763DD1F3ACB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib.Test", "ModernKeePassLib.Test\ModernKeePassLib.Test.csproj", "{067456C0-086C-46A8-B37F-1405717B7BFC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2E710089-9559-4967-846C-E763DD1F3ACB} = {2E710089-9559-4967-846C-E763DD1F3ACB}
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib.Test", "ModernKeePassLib.Test\ModernKeePassLib.Test.csproj", "{0A4279CF-2A67-4868-9906-052E50C25F3B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,22 +61,30 @@ Global
 		{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
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|ARM.Build.0 = Debug|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|x64.Build.0 = Debug|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|x86.Build.0 = Debug|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Release|ARM.ActiveCfg = Release|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Release|ARM.Build.0 = Release|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Release|x64.ActiveCfg = Release|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Release|x64.Build.0 = Release|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.Release|x86.ActiveCfg = Release|Any CPU
-		{067456C0-086C-46A8-B37F-1405717B7BFC}.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

@@ -1,4 +1,6 @@
-using Windows.UI.Xaml;
+using System.Threading.Tasks;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Microsoft.Xaml.Interactivity;
 
@@ -13,11 +15,13 @@ namespace ModernKeePass.Actions
         }
 
         public static readonly DependencyProperty TargetObjectProperty =
-            DependencyProperty.Register("TargetObject", typeof(Control), typeof(SetupFocusAction), new PropertyMetadata(0));
+            DependencyProperty.Register("TargetObject", typeof(Control), typeof(SetupFocusAction), new PropertyMetadata(null));
 
         public object Execute(object sender, object parameter)
         {
-            return TargetObject?.Focus(FocusState.Programmatic);
+            return Task.Factory.StartNew(
+                () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+                    () => TargetObject?.Focus(FocusState.Programmatic)));
         }
     }
 }

ModernKeePass/App.xaml

@@ -8,6 +8,8 @@
             <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>

ModernKeePass/App.xaml.cs

@@ -1,14 +1,14 @@
 using System;
+using System.Collections.Generic;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.Search;
-using Windows.Foundation;
+using Windows.Data.Json;
 using Windows.Storage;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 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
 
@@ -17,7 +17,7 @@ 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();
 
@@ -31,6 +31,7 @@ namespace ModernKeePass
             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.
@@ -38,11 +39,21 @@ 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)
             {
-                DebugSettings.EnableFrameRateCounter = true;
+                //DebugSettings.EnableFrameRateCounter = true;
             }
 #endif
 
@@ -53,9 +64,8 @@ namespace ModernKeePass
             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;
 
@@ -68,13 +78,30 @@ namespace ModernKeePass
                 Window.Current.Content = rootFrame;
             }
 
+            if (e is LaunchActivatedEventArgs)
+            {
+                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(MainPage), e.Arguments);
+                    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();
         }
@@ -99,19 +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();
+            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(MainPage), args);
+            rootFrame.Navigate(typeof(Pages.MainPage), args);
             Window.Current.Content = rootFrame;
             Window.Current.Activate();
         }
+        #endregion
     }
 }

ModernKeePass/BundleArtifacts/neutral.txt

@@ -1,4 +1,4 @@
-MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.2.0.14_AnyCPU.appx
-SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePass_1.2.0.14_Test\ModernKeePass_1.2.0.14_AnyCPU.appxsym
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.2.0.14_scale-140.appx
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.2.0.14_scale-180.appx
+MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.27_AnyCPU.appx
+SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePassApp_1.6.0.27_Test\ModernKeePassApp_1.6.0.27_AnyCPU.appxsym
+ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.27_scale-140.appx
+ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.27_scale-180.appx

ModernKeePass/Common/DatabaseHelper.cs

@@ -1,7 +1,9 @@
 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;
@@ -16,13 +18,31 @@ namespace ModernKeePass.Common
             Opening = 1,
             Opened = 2
         }
-        private PwDatabase _pwDatabase = new PwDatabase();
+        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; }
@@ -33,12 +53,35 @@ namespace ModernKeePass.Common
             }
         }
 
-        public string Open(string password, bool createNew = false)
+        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)
         {
-            var key = new CompositeKey();
             try
             {
-                key.AddUserKey(new KcpPassword(password));
+                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());
@@ -46,7 +89,7 @@ namespace ModernKeePass.Common
                 if (_pwDatabase.IsOpen)
                 {
                     Status = DatabaseStatus.Opened;
-                    RootGroup = new GroupVm(_pwDatabase.RootGroup, null);
+                    RootGroup = new GroupVm(_pwDatabase.RootGroup, null, RecycleBinEnabled ? _pwDatabase.RecycleBinUuid : null);
                 }
             }
             catch (ArgumentNullException)
@@ -64,6 +107,10 @@ namespace ModernKeePass.Common
             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;
@@ -71,16 +118,40 @@ namespace ModernKeePass.Common
             Status = DatabaseStatus.Opened;
         }
 
+        /// <summary>
+        /// Commit the changes to the currently opened database to file
+        /// </summary>
         public void Save()
         {
-            if (_pwDatabase != null && _pwDatabase.IsOpen)
+            // 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

@@ -8,7 +8,7 @@ namespace ModernKeePass.Common
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = "")
+        protected void OnPropertyChanged(string propertyName = "")
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

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/OpenDatabaseUserControl.xaml

@@ -1,344 +0,0 @@
-<UserControl
-    x:Class="ModernKeePass.Controls.OpenDatabaseUserControl"
-    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"
-    d:DesignHeight="65"
-    d:DesignWidth="335" Loaded="UserControl_Loaded">
-    <UserControl.Resources>
-        <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="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="&#xE052;"
-                                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                               AutomationProperties.AccessibilityView="Raw"/>
-                                                    </Border>
-                                                </Grid>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-
-                                <Style x:Name="GotoButtonStyle" 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="&#xE111;"
-                                                               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 x:Name="GotoButton"
-                                Grid.Row="1"
-                                Style="{StaticResource GotoButtonStyle}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                IsTabStop="False"
-                                Grid.Column="2"
-                                Visibility="Visible"
-                                FontSize="{TemplateBinding FontSize}"
-                                VerticalAlignment="Stretch"
-                                Click="OpenButton_OnClick" />
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </UserControl.Resources>
-    <StackPanel>
-        <PasswordBox x:Name="PasswordBox" Width="300" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" PlaceholderText="Password" Style="{StaticResource PasswordBoxWithButtonStyle}"/>
-        <!--<StackPanel Orientation="Horizontal" Margin="0,-1,0,-1" >
-            <Button Click="OpenButton_OnClick" Width="auto" Padding="2,0">
-                <SymbolIcon Symbol="Forward" />
-            </Button>
-        </StackPanel>-->
-        <TextBlock x:Name="StatusTextBlock" Height="32" Width="auto" Foreground="#FFBF6969" FontSize="16" FontWeight="Bold" />
-    </StackPanel>
-</UserControl>

ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Windows.System;
-using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using ModernKeePass.Common;
-using ModernKeePass.Events;
-
-// 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 OpenDatabaseUserControl : UserControl
-    {
-        public bool CreateNew
-        {
-            get { return (bool)GetValue(CreateNewProperty); }
-            set { SetValue(CreateNewProperty, value); }
-        }
-        public static readonly DependencyProperty CreateNewProperty =
-            DependencyProperty.Register(
-                "CreateNew",
-                typeof(bool),
-                typeof(OpenDatabaseUserControl),
-                new PropertyMetadata(null, (o, args) => { }));
-
-        public OpenDatabaseUserControl()
-        {
-            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());
-            var app = (App)Application.Current;
-            StatusTextBlock.Text = app.Database.Open(PasswordBox.Password, CreateNew);
-            if (app.Database.Status == DatabaseHelper.DatabaseStatus.Opened)
-                ValidationChecked?.Invoke(this, new PasswordEventArgs(app.Database.RootGroup));
-        }
-
-        private void PasswordBox_KeyDown(object sender, KeyRoutedEventArgs e)
-        {
-            if (e.Key == VirtualKey.Enter) OpenButton_OnClick(null, null);
-        }
-
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            Task.Factory.StartNew(
-                () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
-                        () => PasswordBox.Focus(FocusState.Programmatic)));
-        }
-    }
-}

ModernKeePass/Controls/TextBoxWithButton.cs

@@ -6,15 +6,38 @@ namespace ModernKeePass.Controls
 {
     public class TextBoxWithButton : TextBox
     {
-        public event EventHandler<RoutedEventArgs> GotoClick;
+        /*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("&#xE107;", (o, args) => { }));
+        public event EventHandler<RoutedEventArgs> ButtonClick;
 
         protected override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-            var extraButton = GetTemplateChild("GotoButton") as Button;
-            if (extraButton != null)
+            var actionButton = GetTemplateChild("ActionButton") as Button;
+            if (actionButton != null)
             {
-                extraButton.Click += (sender, e) => GotoClick?.Invoke(sender, e);
+                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/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/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/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/Interfaces/IHasSelectableObject.cs

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

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,66 +0,0 @@
-<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:controls="using:ModernKeePass.Controls"
-    x:Class="ModernKeePass.MainPage"
-    mc:Ignorable="d"
-    Background="{StaticResource ApplicationPageBackgroundThemeBrush}" >
-    <Page.DataContext>
-        <viewModels:MainVm />
-    </Page.DataContext>
-    <Page.Resources>
-        <CollectionViewSource 
-            x:Name="MenuItemsSource" 
-            Source="{Binding MainMenuItems}" 
-            IsSourceGrouped="True" />
-    </Page.Resources>
-
-    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}" >
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="50" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <controls:ListViewWithDisable Grid.Column="0" 
-            x:Name="MenuListView"
-            RequestedTheme="Dark"
-            SelectionChanged="ListView_SelectionChanged" 
-            Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-            ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
-            SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
-            IsSynchronizedWithCurrentItem="False">
-            <ListView.Header>
-                <TextBlock Text="ModernKeePass" FontWeight="Bold" FontSize="36" Margin="20" />
-            </ListView.Header>
-            <ListView.ItemTemplate>
-                <DataTemplate >
-                    <StackPanel Orientation="Horizontal">
-                        <SymbolIcon Symbol="{Binding SymbolIcon}" />
-                        <TextBlock Text="{Binding Title}" Margin="10,5,0,0" />
-                    </StackPanel>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-            <ListView.ItemContainerStyle>
-                <Style TargetType="ListViewItem">
-                    <Setter Property="Padding" Value="20,5,0,0" />
-                    <Setter Property="Margin" Value="0" />
-                </Style>
-            </ListView.ItemContainerStyle>
-            <ListView.GroupStyle>
-                <GroupStyle HidesIfEmpty="True">
-                    <GroupStyle.HeaderTemplate>
-                        <DataTemplate>
-                            <Grid Background="DarkGray" Margin="20,0,0,0">
-                                <Border Height="1" Width="240" HorizontalAlignment="Stretch"/>
-                            </Grid>
-                        </DataTemplate>
-                    </GroupStyle.HeaderTemplate>
-                </GroupStyle>
-            </ListView.GroupStyle>
-        </controls:ListViewWithDisable>
-        <Frame Grid.Column="2" Name="MenuFrame" Width="auto" Margin="0,60,0,0" />
-    </Grid>
-</Page>

ModernKeePass/MainPage.xaml.cs

@@ -1,31 +0,0 @@
-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
-{
-    /// <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()
-        {
-            InitializeComponent();
-        }
-
-        protected override void OnNavigatedTo(NavigationEventArgs e)
-        {
-            base.OnNavigatedTo(e);
-            DataContext = new MainVm(Frame, MenuFrame);
-        }
-
-        private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            var mainVm = DataContext as MainVm;
-            mainVm.SelectedItem?.Destination.Navigate(mainVm.SelectedItem.PageType, mainVm.SelectedItem.Parameter);
-        }
-    }
-}

ModernKeePass/Mappings/PwIconToSegoeMapping.cs

@@ -10,18 +10,19 @@ namespace ModernKeePass.Mappings
             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.;
+                case PwIcon.MarkedDirectory: return Symbol.Map;
                 case PwIcon.UserCommunication: return Symbol.ContactInfo;
-                //case PwIcon.Parts: return Symbol.;
+                case PwIcon.Parts: return Symbol.ViewAll;
                 case PwIcon.Notepad: return Symbol.Document;
-                //case PwIcon.WorldScoket: return Symbol.;
                 case PwIcon.Identity: return Symbol.Contact2;
-                //case PwIcon.PaperReady: return Symbol.;
+                case PwIcon.PaperReady: return Symbol.SyncFolder;
                 case PwIcon.Digicam: return Symbol.Camera;
                 case PwIcon.IRCommunication: return Symbol.View;
                 case PwIcon.Energy: return Symbol.ZeroBars;
@@ -36,17 +37,16 @@ namespace ModernKeePass.Mappings
                 case PwIcon.Screen: return Symbol.GoToStart;
                 case PwIcon.EnergyCareful: return Symbol.FourBars;
                 case PwIcon.Disk: return Symbol.Save;
-                //case PwIcon.Drive: return Symbol.;
                 //case PwIcon.PaperQ: return Symbol.;
                 //case PwIcon.TerminalEncrypted: return Symbol.;
-                //case PwIcon.Console: return Symbol.;
-                //case PwIcon.Printer: 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.;
-                case PwIcon.Count: return Symbol.MapDrive;
+                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;
@@ -72,10 +72,405 @@ namespace ModernKeePass.Mappings
                 //case PwIcon.Feather: return Symbol.;
                 //case PwIcon.Apple: return Symbol.;
                 //case PwIcon.Wiki: return Symbol.;
-                //case PwIcon.Money: return Symbol.;
+                case PwIcon.Money: return Symbol.Shop;
                 case PwIcon.Certificate: return Symbol.PreviewLink;
                 case PwIcon.BlackBerry: return Symbol.CellPhone;
-                default: return Symbol.More;
+                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,35 +108,66 @@
     <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="Controls\FirstItemDataTemplateSelector.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\OpenDatabaseUserControl.xaml.cs">
-      <DependentUpon>OpenDatabaseUserControl.xaml</DependentUpon>
+    <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="MainPage.xaml.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\NewDatabasePage.xaml.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">
@@ -144,22 +176,25 @@
     <Compile Include="Pages\GroupDetailPage.xaml.cs">
       <DependentUpon>GroupDetailPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\OpenDatabasePage.xaml.cs">
+    <Compile Include="Pages\MainPageFrames\OpenDatabasePage.xaml.cs">
       <DependentUpon>OpenDatabasePage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\RecentDatabasesPage.xaml.cs">
+    <Compile Include="Pages\MainPageFrames\RecentDatabasesPage.xaml.cs">
       <DependentUpon>RecentDatabasesPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\SaveDatabasePage.xaml.cs">
+    <Compile Include="Pages\MainPageFrames\SaveDatabasePage.xaml.cs">
       <DependentUpon>SaveDatabasePage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.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">
@@ -179,14 +214,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="Controls\OpenDatabaseUserControl.xaml">
+    <Page Include="Controls\CompositeKeyUserControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="MainPage.xaml">
+    <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>
@@ -195,19 +234,35 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\NewDatabasePage.xaml">
+    <Page Include="Pages\MainPageFrames\NewDatabasePage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\OpenDatabasePage.xaml">
+    <Page Include="Pages\MainPageFrames\OpenDatabasePage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\RecentDatabasesPage.xaml">
+    <Page Include="Pages\MainPageFrames\RecentDatabasesPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\SaveDatabasePage.xaml">
+    <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>
@@ -216,6 +271,16 @@
       <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>
@@ -227,8 +292,12 @@
       <HintPath>..\packages\Portable.BouncyCastle.1.8.1.3\lib\netstandard1.0\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ModernKeePassLib, Version=2.28.1.4000, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ModernKeePassLib.2.28.4000\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
+    <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.5000\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -240,7 +309,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Validation, Version=2.4.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Validation.2.4.15\lib\portable-net45+win8+wp8+wpa81\Validation.dll</HintPath>
+      <HintPath>..\packages\Validation.2.4.18\lib\portable-net45+win8+wp8+wpa81\Validation.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -295,15 +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/ModernKeePassApp.csproj.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=viewmodels_005Citems/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

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.2.0.14" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.6.0.27" />
   <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" />

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

@@ -6,19 +6,407 @@
     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"/>
-    </Page.Resources>
+        <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/>
     </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>
@@ -26,60 +414,94 @@
             </TransitionCollection>
         </Grid.ChildrenTransitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="140"/>
+            <RowDefinition Height="50"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <StackPanel Grid.Row="1" Margin="20,0,0,0" >
+        <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 x:Name="userTextBlock" TextWrapping="Wrap" Text="User name or login" FontSize="18"/>
-            <TextBox x:Name="userTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding UserName, Mode=TwoWay}" Width="350"  Height="32" />
-            <TextBlock x:Name="passwordTextBlock" TextWrapping="Wrap" Text="Password"  FontSize="18"/>
-            <PasswordBox x:Name="passwordBox" HorizontalAlignment="Left" Password="{Binding Password, Mode=TwoWay}" Width="350"  Height="32" IsPasswordRevealButtonEnabled="True" Visibility="{Binding IsRevealPassword, Converter={StaticResource InverseBooleanToVisibilityConverter}}" />
-            <TextBox x:Name="passwordTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Password, Mode=TwoWay}" Width="350" Height="32" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" />
-            <CheckBox x:Name="checkBox" HorizontalAlignment="Left" Margin="-3,0,0,0" Content="Show password" IsChecked="{Binding IsRevealPassword, Mode=TwoWay}"/>
-            <TextBlock x:Name="urlTextBlock" TextWrapping="Wrap" Text="URL" FontSize="18"/>
-            <!--<StackPanel Orientation="Horizontal" Margin="0,-1,0,-1" Width="350" HorizontalAlignment="Left">
-                <TextBox x:Name="urlTextBox" TextWrapping="Wrap" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Padding="0,0,34,0" />
-                <Button Click="UrlButton_Click" Height="34" Margin="-34,0,0,0" Background="Transparent" Padding="2,0" >
-                    <SymbolIcon Symbol="Forward" VerticalAlignment="Center" />
-                </Button>
-            </StackPanel>-->
-            <local:TextBoxWithButton x:Name="urlTextBox" HorizontalAlignment="Left" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Style="{StaticResource TextBoxWithButtonStyle}" GotoClick="UrlButton_Click" />
-            <TextBlock x:Name="notesTextBlock" TextWrapping="Wrap" Text="Notes" FontSize="18"/>
-            <TextBox x:Name="notesTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" />
+            <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="200"/>
+                <ColumnDefinition Width="400"/>
             </Grid.ColumnDefinitions>
-            <Button Margin="39,0,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
-                        Style="{StaticResource NavigationBackButtonNormalStyle}"
+            <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"/>
+                    AutomationProperties.ItemType="Navigation Button"
+                    Style="{StaticResource NoBorderButtonStyle}">
+                <SymbolIcon Symbol="Back" />
+            </Button>
+            <StackPanel Grid.Column="1" >
                 <TextBox  
-                Grid.Column="1"
-                Text="{Binding Title, Mode=TwoWay}" 
-                Style="{StaticResource HeaderTextBoxStyle}"
+                    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" 
-                Margin="0,0,30,0"/>
-            <CommandBar Grid.Column="2" Background="Transparent" IsOpen="True" VerticalAlignment="Center" Margin="0,20,0,0">
-                <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}" />
-                <AppBarButton Icon="Delete" Label="Delete" Click="AppBarButton_Click" />
-            </CommandBar>
+                    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,9 +1,9 @@
 using System;
-using Windows.UI.Popups;
-using ModernKeePass.Common;
+using Windows.ApplicationModel.DataTransfer;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 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
@@ -14,21 +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 => navigationHelper;
+        public NavigationHelper NavigationHelper { get; }
 
         public EntryDetailPage()
         {
             InitializeComponent();
-            navigationHelper = new NavigationHelper(this);
-            navigationHelper.LoadState += navigationHelper_LoadState;
+            NavigationHelper = new NavigationHelper(this);
+            NavigationHelper.LoadState += navigationHelper_LoadState;
         }
 
         /// <summary>
@@ -57,49 +57,44 @@ 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 async void AppBarButton_Click(object sender, RoutedEventArgs e)
+        private void DeleteButton_Click(object sender, RoutedEventArgs e)
         {
-            // Create the message dialog and set its content
-            var messageDialog = new MessageDialog("Are you sure you want to delete this entry?");
-
-            // Add commands and set their callbacks; both buttons use the same callback function instead of inline event handlers
-            messageDialog.Commands.Add(new UICommand("Delete", delete =>
+            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 =>
             {
-                var entry = DataContext as EntryVm;
-                entry?.RemoveEntry();
+                ToastNotificationHelper.ShowMovedToast(Model, "Deleting", text);
+                Model.MarkForDelete();
                 if (Frame.CanGoBack) Frame.GoBack();
-            }));
-            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();
+        private void RestoreButton_Click(object sender, RoutedEventArgs e)
+        {
+            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);
+                var uri = new Uri(UrlTextBox.Text);
                 await Windows.System.Launcher.LaunchUriAsync(uri);
             }
             catch

ModernKeePass/Pages/GroupDetailPage.xaml

@@ -5,9 +5,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     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" 
+    xmlns:templateSelectors="using:ModernKeePass.TemplateSelectors"
     x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.GroupDetailPage"
     mc:Ignorable="d" >
@@ -15,12 +16,50 @@
         <SolidColorBrush x:Key="Transparent" Color="Transparent"/>
         <SolidColorBrush x:Key="SystemColor" Color="{StaticResource SystemColorButtonFaceColor}" />
         <converters:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
-        <converters:PluralizationConverter x:Key="PluralizationConverter"/>
+        <converters:BooleanToFontStyleConverter x:Key="BooleanToFontStyleConverter"/>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
     </Page.Resources>
     <Page.DataContext>
         <viewModels:GroupVm />
     </Page.DataContext>
-    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+    <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"
@@ -32,26 +71,93 @@
                 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 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"
+            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>
+                <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.Row="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" >
+        <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"
-                    IsSwipeEnabled="false" 
                     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 
@@ -63,17 +169,17 @@
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" RenderTransformOrigin="0.5,0.5" >
+                                        <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 Title}" FontWeight="Bold" Style="{ThemeResource TitleTextBlockStyle}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="13,0,0,5"/>
+                                    <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>
                             </Border>
                         </DataTemplate>
                         <DataTemplate x:Name="GroupOtherItem">
-                            <Grid Height="110" Width="480" >
+                            <Grid Height="110" Width="480" x:Name="EntryGrid" >
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*"/>
@@ -90,10 +196,8 @@
                                     </SymbolIcon>
                                 </Border>
                                 <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,0" >
-                                        <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource TextBoxForegroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}"/>
+                                    <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 EntryCount, ConverterParameter=entry\,entries, Converter={StaticResource PluralizationConverter}}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
-                                        <TextBlock Text="{Binding GroupCount, ConverterParameter=group\,groups, Converter={StaticResource PluralizationConverter}}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />-->
                                     <TextBlock Text="{Binding UserName}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
                                     <TextBlock Text="{Binding Url}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
                                 </StackPanel>
@@ -107,7 +211,7 @@
                         <viewModels:EntryVm/>
                     </GridView.DataContext>
                     <GridView.ItemTemplateSelector>
-                        <local:FirstItemDataTemplateSelector 
+                        <templateSelectors:FirstItemDataTemplateSelector 
                             FirstItem="{StaticResource GroupFirstItem}" 
                             OtherItem="{StaticResource GroupOtherItem}" />
                     </GridView.ItemTemplateSelector>
@@ -116,57 +220,6 @@
                             <Setter Property="Margin" Value="52,0,0,2"/>
                         </Style>
                     </GridView.ItemContainerStyle>
-                    <GridView.Header>
-                        <ListView 
-                            x:Name="LeftListView"
-                            SelectionChanged="groups_SelectionChanged"
-                            IsSwipeEnabled="false"
-                            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}">
-                                        <ToolTipService.ToolTip>
-                                            <ToolTip Content="{Binding Name}" />
-                                        </ToolTipService.ToolTip>
-                                    </SymbolIcon>
-                                </DataTemplate>
-                                <DataTemplate x:Name="Expanded">
-                                    <StackPanel Orientation="Horizontal">
-                                        <SymbolIcon Symbol="{Binding IconSymbol}" />
-                                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" />
-                                        <!--<TextBlock Text="{Binding EntryCount}" HorizontalAlignment="Right" VerticalAlignment="Center" />-->
-                                    </StackPanel>
-                                </DataTemplate>
-                            </ListView.Resources>
-                            <ListView.ItemsSource>
-                                <Binding Source="{StaticResource GroupsViewSource}"/>
-                            </ListView.ItemsSource>
-                            <ListView.ItemContainerStyle>
-                                <Style TargetType="ListViewItem">
-                                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-                                    <Setter Property="Padding" Value="20,0,0,0"/>
-                                    <Setter Property="Margin" Value="0"/>
-                                </Style>
-                            </ListView.ItemContainerStyle>
-                            <ListView.HeaderTemplate>
-                                <DataTemplate>
-                                    <ToggleButton IsChecked="{Binding IsLeftPaneOpen, Mode=TwoWay}" Style="{StaticResource HamburgerToggleButton}" Margin="0" />
-                                </DataTemplate>
-                            </ListView.HeaderTemplate>
-                            <interactivity:Interaction.Behaviors>
-                                <core:DataTriggerBehavior Binding="{Binding IsLeftPaneOpen}" Value="True">
-                                    <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Expanded}"/>
-                                </core:DataTriggerBehavior>
-                                <core:DataTriggerBehavior Binding="{Binding IsLeftPaneOpen}" Value="False">
-                                    <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}"/>
-                                </core:DataTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </ListView>
-                    </GridView.Header>
                 </GridView>
             </SemanticZoom.ZoomedInView>
 
@@ -185,7 +238,7 @@
                     <ListView.ItemTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Vertical">
-                                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
+                                <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
                             </StackPanel>
                         </DataTemplate>
                     </ListView.ItemTemplate>
@@ -194,7 +247,7 @@
                             <GroupStyle.HeaderTemplate>
                                 <DataTemplate>
                                     <Grid Background="LightGray" Margin="0,0,10,0" HorizontalAlignment="Left">
-                                        <TextBlock Text="{Binding Key}" Foreground="Black" Margin="30" Style="{StaticResource HeaderTextBlockStyle}"/>
+                                        <TextBlock Text="{Binding Key}" Width="40" Foreground="Black" Margin="30" Style="{StaticResource HeaderTextBlockStyle}"/>
                                     </Grid>
                                 </DataTemplate>
                             </GroupStyle.HeaderTemplate>
@@ -204,40 +257,48 @@
             </SemanticZoom.ZoomedOutView>
         </SemanticZoom>
 
+        </Grid>
         <!-- Back button and page title -->
-        <Grid Grid.Row="0">
+        <Grid Grid.Row="0" Background="{ThemeResource AppBarBackgroundThemeBrush}">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="120"/>
+                <ColumnDefinition Width="60"/>
                 <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="300"/>
+                <ColumnDefinition Width="400"/>
             </Grid.ColumnDefinitions>
-            <Button Margin="39,0,39,0" 
+            <Button Grid.Column="0" 
+                    x:Name="BackButton"
                     Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
-                    Style="{StaticResource NavigationBackButtonNormalStyle}"
+                    Height="50"
+                    Width="50"
                     VerticalAlignment="Center"
                     AutomationProperties.Name="Back"
                     AutomationProperties.AutomationId="BackButton"
-                    AutomationProperties.ItemType="Navigation Button"/>
+                    AutomationProperties.ItemType="Navigation Button"
+                    Style="{StaticResource NoBorderButtonStyle}">
+                <SymbolIcon Symbol="Back" />
+            </Button>
+            <StackPanel Grid.Column="1" >
                 <TextBox
-                Grid.Column="1" 
+                    x:Name="TitleTextBox"
                     Text="{Binding Name, Mode=TwoWay}" 
-                Style="{StaticResource HeaderTextBoxStyle}"
                     Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
+                    Background="Transparent"
                     IsHitTestVisible="{Binding IsEditMode}" 
+                    BorderThickness="0" 
+                    FontSize="20"
+                    FontWeight="SemiBold"
                     TextWrapping="NoWrap" 
                     VerticalAlignment="Center" 
-                Margin="0,0,30,0"/>
-            <CommandBar Grid.Column="2" Background="Transparent" IsOpen="True" VerticalAlignment="Center" Margin="0,20,0,0">
-                <AppBarButton Icon="Find" Label="Search">
-                    <AppBarButton.Flyout>
-                        <Flyout>
-                            <SearchBox PlaceholderText="Search..." Width="350" SuggestionsRequested="SearchBox_OnSuggestionsRequested" SearchHistoryEnabled="False"  ResultSuggestionChosen="SearchBox_OnResultSuggestionChosen" />
-                        </Flyout>
-                    </AppBarButton.Flyout>
-                </AppBarButton>
-                <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}" />
-                <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="DeleteButton_Click" />
-            </CommandBar>
+                    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,10 +1,11 @@
 using System;
 using System.Linq;
 using Windows.Storage.Streams;
-using Windows.UI.Popups;
-using ModernKeePass.Common;
+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
@@ -15,13 +16,14 @@ 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
     {
         /// <summary>
         /// NavigationHelper is used on each page to aid in navigation and 
         /// process lifetime management
         /// </summary>
         public NavigationHelper NavigationHelper { get; }
+        public GroupVm Model => (GroupVm)DataContext;
 
         public GroupDetailPage()
         {
@@ -58,7 +60,9 @@ namespace ModernKeePass.Pages
         {
             NavigationHelper.OnNavigatedTo(e);
 
-            if (!(e.Parameter is GroupVm)) return;
+            if (e.Parameter is PasswordEventArgs)
+                DataContext = ((PasswordEventArgs) e.Parameter).RootGroup;
+            else if (e.Parameter is GroupVm)
                 DataContext = (GroupVm) e.Parameter;
         }
 
@@ -69,66 +73,66 @@ namespace ModernKeePass.Pages
 
         #endregion
         
-
         #region Event Handlers
 
         private void groups_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (LeftListView.SelectedIndex == 0)
+            GroupVm group;
+            switch (LeftListView.SelectedIndex)
             {
-                var currentGroup = DataContext as GroupVm;
-                currentGroup?.CreateNewGroup();
-                LeftListView.SelectedIndex = -1;
-                // TODO: Navigate to new group?
+                case -1:
                     return;
+                case 0:
+                    group = Model.AddNewGroup();
+                    break;
+                default:
+                    group = LeftListView.SelectedItem as GroupVm;
+                    break;
             }
-            var selectedItem = LeftListView.SelectedItem as GroupVm;
-            if (selectedItem == null) return;
-            Frame.Navigate(typeof(GroupDetailPage), selectedItem);
+            Frame.Navigate(typeof(GroupDetailPage), group);
         }
         
         private void entries_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
+            EntryVm entry;
             switch (GridView.SelectedIndex)
             {
                 case -1:
                     return;
                 case 0:
-                    var currentGroup = DataContext as GroupVm;
-                    currentGroup?.CreateNewEntry();
-                    GridView.SelectedIndex = -1;
-                    // TODO: Navigate to new entry?
-                    return;
+                    entry = Model.AddNewEntry();
+                    break;
+                default:
+                    entry = GridView.SelectedItem as EntryVm;
+                    break;
             }
-            Frame.Navigate(typeof(EntryDetailPage), GridView.SelectedItem as EntryVm);
+            Frame.Navigate(typeof(EntryDetailPage), entry);
         }
 
-        private async void DeleteButton_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void DeleteButton_Click(object sender, RoutedEventArgs e)
         {
-            // Create the message dialog and set its content
-            var messageDialog = new MessageDialog("Are you sure you want to delete the whole group and all its entries?");
-
-            // Add commands and set their callbacks; both buttons use the same callback function instead of inline event handlers
-            messageDialog.Commands.Add(new UICommand("Delete", delete =>
+            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 =>
             {
-                var group = DataContext as GroupVm;
-                group?.RemoveGroup();
+                ToastNotificationHelper.ShowMovedToast(Model, "Deleting", text);
+                Model.MarkForDelete();
                 if (Frame.CanGoBack) Frame.GoBack();
-            }));
-            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();
+        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;
@@ -137,23 +141,20 @@ namespace ModernKeePass.Pages
 
         private void SearchBox_OnSuggestionsRequested(SearchBox sender, SearchBoxSuggestionsRequestedEventArgs args)
         {
-            var viewModel = DataContext as GroupVm;
             var imageUri = RandomAccessStreamReference.CreateFromUri(new Uri("ms-appx://Assets/Logo.scale-80.png"));
-            var results = viewModel.Entries.Skip(1).Where(e => e.Title.IndexOf(args.QueryText, StringComparison.OrdinalIgnoreCase) >= 0).Take(5);
+            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.Title, result.ParentGroup.Name, result.Id, imageUri, string.Empty);
+                args.Request.SearchSuggestionCollection.AppendResultSuggestion(result.Name, result.ParentGroup.Name, result.Id, imageUri, string.Empty);
             }
         }
 
         private void SearchBox_OnResultSuggestionChosen(SearchBox sender, SearchBoxResultSuggestionChosenEventArgs args)
         {
-            var viewModel = DataContext as GroupVm;
-            var entry = viewModel.Entries.Skip(1).FirstOrDefault(e => e.Id == args.Tag);
+            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

@@ -14,10 +14,12 @@ 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 : Page
+    public sealed partial class NewDatabasePage
     {
         private Frame _mainFrame;
 
+        public NewVm Model => (NewVm)DataContext;
+
         public NewDatabasePage()
         {
             InitializeComponent();
@@ -40,13 +42,7 @@ namespace ModernKeePass.Pages
 
             var file = await savePicker.PickSaveFileAsync();
             if (file == null) return;
-            var viewModel = DataContext as OpenVm;
-            viewModel.OpenFile(file);
-        }
-
-        private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e)
-        {
-            _mainFrame.Navigate(typeof(GroupDetailPage), e.RootGroup);
+            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

@@ -1,11 +1,8 @@
 using System;
 using Windows.Storage.Pickers;
-using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Navigation;
-using ModernKeePass.Common;
 using ModernKeePass.Events;
 using ModernKeePass.ViewModels;
 
@@ -16,10 +13,12 @@ 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 : Page
+    public sealed partial class OpenDatabasePage
     {
         private Frame _mainFrame;
 
+        public OpenVm Model => (OpenVm)DataContext;
+
         public OpenDatabasePage()
         {
             InitializeComponent();
@@ -41,14 +40,10 @@ namespace ModernKeePass.Pages
                 };
             picker.FileTypeFilter.Add(".kdbx");
             
-            var viewModel = DataContext as OpenVm;
             // Application now has read/write access to the picked file
-            viewModel.OpenFile(await picker.PickSingleFileAsync());
-        }
-
-        private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e)
-        {
-            _mainFrame.Navigate(typeof(GroupDetailPage), e.RootGroup);
+            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

@@ -11,7 +11,9 @@
     </Page.DataContext>
 
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <HyperlinkButton x:Name="SaveButton" Content="Save and close" Click="SaveButton_OnClick" VerticalAlignment="Top" IsEnabled="{Binding IsSaveEnabled}" />
-        <HyperlinkButton x:Name="SaveAsButton" Content="Save as..." Click="SaveAsButton_OnClick" VerticalAlignment="Top" IsEnabled="{Binding IsSaveEnabled}" />
+        <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

@@ -13,9 +13,10 @@ 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 : Page
+    public sealed partial class SaveDatabasePage
     {
         private Frame _mainFrame;
+        public SaveVm Model => (SaveVm)DataContext;
         public SaveDatabasePage()
         {
             InitializeComponent();
@@ -29,8 +30,7 @@ namespace ModernKeePass.Pages
 
         private void SaveButton_OnClick(object sender, RoutedEventArgs e)
         {
-            var viewModel = DataContext as SaveVm;
-            viewModel.Save();
+            Model.Save();
             _mainFrame.Navigate(typeof(MainPage));
         }
 
@@ -45,8 +45,7 @@ namespace ModernKeePass.Pages
 
             var file = await savePicker.PickSaveFileAsync();
             if (file == null) return;
-            var viewModel = DataContext as SaveVm;
-            viewModel.Save(file);
+            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/NewDatabasePage.xaml

@@ -1,23 +0,0 @@
-<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:controls="using:ModernKeePass.Controls"
-    xmlns:converters="using:ModernKeePass.Converters"
-    xmlns:viewModels="using:ModernKeePass.ViewModels"
-    mc:Ignorable="d">
-    <Page.Resources>
-    <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-    </Page.Resources>
-    <Page.DataContext>
-        <viewModels:OpenVm />
-    </Page.DataContext>
-    
-    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <HyperlinkButton Content="Create new..." Click="ButtonBase_OnClick" />
-        <TextBlock TextWrapping="Wrap" Text="{Binding Name}" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
-        <controls:OpenDatabaseUserControl CreateNew="True" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecked="PasswordUserControl_PasswordChecked" />
-    </StackPanel>
-</Page>

ModernKeePass/Pages/OpenDatabasePage.xaml

@@ -1,24 +0,0 @@
-<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"
-    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" />
-        <HyperlinkButton Content="From Url..." IsEnabled="False" />
-        <TextBlock TextWrapping="Wrap" Text="{Binding Name}" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
-        <local:OpenDatabaseUserControl HorizontalAlignment="Left" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecked="PasswordUserControl_PasswordChecked" />
-    </StackPanel>
-</Page>

ModernKeePass/Pages/RecentDatabasesPage.xaml

@@ -1,38 +0,0 @@
-<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" 
-    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}">
-        <ListView.ItemTemplate>
-            <DataTemplate>
-                <StackPanel Margin="10,0,10,0">
-                    <TextBlock Text="{Binding Name}" Width="350" Padding="5,0,0,0" />
-                    <TextBlock Text="{Binding Path}" Width="350" Padding="5,0,0,0" FontSize="10" />
-                    <local:OpenDatabaseUserControl Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecking="OpenDatabaseUserControl_OnValidationChecking" ValidationChecked="PasswordUserControl_PasswordChecked" />
-                </StackPanel>
-            </DataTemplate>
-        </ListView.ItemTemplate>
-        <ListView.ItemContainerStyle>
-            <Style TargetType="ListViewItem">
-                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                <Setter Property="VerticalContentAlignment" Value="Stretch" />
-            </Style>
-        </ListView.ItemContainerStyle>
-    </ListView>
-</Page>

ModernKeePass/Pages/RecentDatabasesPage.xaml.cs

@@ -1,43 +0,0 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-using ModernKeePass.Events;
-using ModernKeePass.ViewModels;
-
-// Pour en savoir plus sur le modèle d'élément Page vierge, consultez la page http://go.microsoft.com/fwlink/?LinkId=234238
-
-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 : Page
-    {
-        private Frame _mainFrame;
-
-        public RecentDatabasesPage()
-        {
-            InitializeComponent();
-        }
-
-        protected override void OnNavigatedTo(NavigationEventArgs e)
-        {
-            base.OnNavigatedTo(e);
-            _mainFrame = e.Parameter as Frame;
-        }
-        
-        private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e)
-        {
-            _mainFrame.Navigate(typeof(GroupDetailPage), e.RootGroup);
-        }
-
-        private void OpenDatabaseUserControl_OnValidationChecking(object sender, EventArgs e)
-        {
-            //throw new NotImplementedException();
-            var viewModel = DataContext as RecentVm;
-            var app = (App)Application.Current;
-            app.Database.DatabaseFile = viewModel.SelectedItem.DatabaseFile;
-        }
-    }
-}

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}" IsEnabled="False" />
+    </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

@@ -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.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 [assembly: ComVisible(false)]

ModernKeePass/Styles/HamburgerButtonStyle.xaml

@@ -7,7 +7,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
                     <ContentControl>
-                        <Grid Background="Transparent" Margin="0" Width="77" Height="77">
+                        <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>
@@ -36,13 +36,12 @@
         </Setter>
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="Margin" Value="20" />
+        <Setter Property="Margin" Value="0" />
     </Style>
     <Style x:Key="HeaderTextBoxStyle" TargetType="TextBox">
-        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="FontSize" Value="40"/>
         <Setter Property="FontWeight" Value="Light"/>
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="Background" Value="Transparent" />
-        <!--<Setter Property="LineHeight" Value="40"/>-->
     </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

@@ -1,8 +1,9 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:ModernKeePass.Controls">
 
-    <Style TargetType="TextBox" x:Name="TextBoxWithButtonStyle">
+    <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}" />
@@ -18,10 +19,10 @@
         <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="TextBox">
+                <ControlTemplate TargetType="controls:TextBoxWithButton">
                     <Grid>
                         <Grid.Resources>
-                            <Style x:Name="GotoButtonStyle" TargetType="Button">
+                            <Style x:Name="ActionButtonStyle" TargetType="Button">
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="Button">
@@ -87,7 +88,7 @@
                                                             VerticalAlignment="Center"
                                                             HorizontalAlignment="Center"
                                                             FontStyle="Normal"
-                                                            Text="&#xE111;"
+                                                            Text="{TemplateBinding Content}"
                                                             FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                                             AutomationProperties.AccessibilityView="Raw"/>
                                                 </Border>
@@ -148,7 +149,7 @@
                             <VisualStateGroup x:Name="ButtonStates">
                                 <VisualState x:Name="ButtonVisible">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GotoButton"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton"
                                                                        Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
@@ -212,14 +213,15 @@
                                       Grid.ColumnSpan="2"
                                       Content="{TemplateBinding PlaceholderText}" 
                                       IsHitTestVisible="False"/>
-                        <Button x:Name="GotoButton"
+                        <Button x:Name="ActionButton"
                                 Grid.Row="1"
-                                Style="{StaticResource GotoButtonStyle}"
+                                Style="{StaticResource ActionButtonStyle}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 IsTabStop="False"
                                 Grid.Column="1"
                                 Visibility="Collapsed"
                                 FontSize="{TemplateBinding FontSize}"
+                                Content="{TemplateBinding ButtonSymbol}"
                                 VerticalAlignment="Stretch"/>
                     </Grid>
                 </ControlTemplate>

ModernKeePass/TemplateSelectors/FirstItemDataTemplateSelector.cs

@@ -1,7 +1,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace ModernKeePass.Controls
+namespace ModernKeePass.TemplateSelectors
 {
     public class FirstItemDataTemplateSelector: DataTemplateSelector
     {

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/EntryVm.cs

@@ -1,41 +1,78 @@
-using Windows.UI.Text;
+using System;
+using System.ComponentModel;
+using System.Text;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
 using ModernKeePass.Mappings;
 using ModernKeePassLib;
+using ModernKeePassLib.Cryptography.PasswordGenerator;
 using ModernKeePassLib.Security;
+using ModernKeePassLib.Cryptography;
 
 namespace ModernKeePass.ViewModels
 {
-    public class EntryVm: NotifyPropertyChangedBase
+    public class EntryVm : INotifyPropertyChanged, IPwEntity
     {
-        public GroupVm ParentGroup { get; }
-        public PwEntry Entry { get; }
+        public GroupVm ParentGroup { get; private set; }
 
-        public System.Drawing.Color? BackgroundColor => Entry?.BackgroundColor;
-        public System.Drawing.Color? ForegroundColor => Entry?.ForegroundColor;
+        public GroupVm PreviousGroup { get; private set; }
 
-        public string Title
+        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
+        {
+            get { return _passwordLength; }
+            set
+            {
+                _passwordLength = value;
+                NotifyPropertyChanged("PasswordLength");
+            }
+        }
+        public string Name
         {
             get
             {
                 var title = GetEntryValue(PwDefs.TitleField);
-                return title == null ? "New entry" : title;
+                return title == null ? "< New entry >" : title;
             }
             set { SetEntryValue(PwDefs.TitleField, value); }
         }
 
-        public string Id => Entry.Uuid.ToHexString();
+        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); }
+            set
+            {
+                SetEntryValue(PwDefs.PasswordField, value);
+                NotifyPropertyChanged("Password");
+                NotifyPropertyChanged("PasswordComplexityIndicator");
+            }
         }
         public string Url
         {
@@ -52,47 +89,160 @@ namespace ModernKeePass.ViewModels
         {
             get
             {
-                if (Entry == null) return Symbol.Add;
-                var result = PwIconToSegoeMapping.GetSymbolFromIcon(Entry.IconId);
+                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 { SetProperty(ref _isEditMode, value); }
+            set
+            {
+                _isEditMode = value;
+                NotifyPropertyChanged("IsEditMode");
+            }
         }
 
         public bool IsRevealPassword
         {
             get { return _isRevealPassword; }
-            set { SetProperty(ref _isRevealPassword, value); }
+            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)
         {
-            Entry = entry;
+            _pwEntry = entry;
             ParentGroup = parent;
         }
         
-        public void RemoveEntry()
+        public void GeneratePassword()
         {
-            ParentGroup.RemoveEntry(this);
+            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 Entry?.Strings.GetSafe(key).ReadString();
+            return _pwEntry?.Strings.GetSafe(key).ReadString();
         }
         
         private void SetEntryValue(string key, string newValue)
         {
-            Entry?.Strings.Set(key, new ProtectedString(true, 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,40 +1,59 @@
 using System.Collections.ObjectModel;
 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 : NotifyPropertyChangedBase
+    public class GroupVm : NotifyPropertyChangedBase, IPwEntity, ISelectableModel
     {
-        public GroupVm ParentGroup { get; }
+        public GroupVm ParentGroup { get; private set; }
+        public GroupVm PreviousGroup { get; private set; }
         public ObservableCollection<EntryVm> Entries { get; set; } = new ObservableCollection<EntryVm>();
         
         public ObservableCollection<GroupVm> Groups { get; set; } = new ObservableCollection<GroupVm>();
 
         public int EntryCount => Entries.Count() - 1;
-        public int GroupCount => Groups.Count - 1;
-        public bool IsNotRoot => ParentGroup != null;
         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 IOrderedEnumerable<IGrouping<char, EntryVm>> EntriesZoomedOut
+        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 from e in Entries
-                       where e.Entry != null
-                       group e by e.Title.FirstOrDefault() into grp
+                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 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; }
+            get { return _pwGroup == null ? "< New group >" : _pwGroup.Name; }
             set { _pwGroup.Name = value; }
         }
 
@@ -46,12 +65,7 @@ namespace ModernKeePass.ViewModels
                 var result = PwIconToSegoeMapping.GetSymbolFromIcon(_pwGroup.IconId);
                 return result == Symbol.More ? Symbol.Folder : result;
             }
-        }
-
-        public bool IsLeftPaneOpen
-        {
-            get { return _isLeftPaneOpen; }
-            set { SetProperty(ref _isLeftPaneOpen, value); }
+            set { _pwGroup.IconId = PwIconToSegoeMapping.GetIconFromSymbol(value); }
         }
         
         public bool IsEditMode
@@ -60,46 +74,106 @@ namespace ModernKeePass.ViewModels
             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 bool _isLeftPaneOpen;
+        private readonly App _app = Application.Current as App;
         private bool _isEditMode;
 
         public GroupVm() {}
 
-        public GroupVm(PwGroup pwGroup, GroupVm parent)
+        public GroupVm(PwGroup pwGroup, GroupVm parent, PwUuid recycleBinId = null)
         {
             _pwGroup = pwGroup;
             ParentGroup = parent;
-            Entries = new ObservableCollection<EntryVm>(pwGroup.Entries.Select(e => new EntryVm(e, this)).OrderBy(e => e.Title));
+
+            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)).OrderBy(g => g.Name));
+            Groups = new ObservableCollection<GroupVm>(pwGroup.Groups.Select(g => new GroupVm(g, this, recycleBinId)).OrderBy(g => g.Name));
             Groups.Insert(0, new GroupVm ());
         }
 
-        public void CreateNewGroup()
+        public GroupVm AddNewGroup(string name = "")
         {
-            var pwGroup = new PwGroup(true, true, "New group", PwIcon.Folder);
+            var pwGroup = new PwGroup(true, true, name, PwIcon.Folder);
             _pwGroup.AddGroup(pwGroup, true);
-            Groups.Add(new GroupVm(pwGroup, this));
+            var newGroup = new GroupVm(pwGroup, this) {Name = name, IsEditMode = string.IsNullOrEmpty(name)};
+            Groups.Add(newGroup);
+            return newGroup;
         }
         
-        public void CreateNewEntry()
+        public EntryVm AddNewEntry()
         {
             var pwEntry = new PwEntry(true, true);
             _pwGroup.AddEntry(pwEntry, true);
-            Entries.Add(new EntryVm(pwEntry, this));
+            var newEntry = new EntryVm(pwEntry, this) {IsEditMode = true};
+            Entries.Add(newEntry);
+            return newEntry;
         }
 
-        public void RemoveGroup()
+        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);
-            ParentGroup.Groups.Remove(this);
+            if (_app.Database.RecycleBinEnabled && !PreviousGroup.IsSelected) _app.Database.RecycleBin._pwGroup.AddGroup(_pwGroup, true);
+            else _app.Database.AddDeletedItem(IdUuid);
         }
 
-        public void RemoveEntry(EntryVm entry)
+        public void Save()
         {
-            _pwGroup.Entries.Remove(entry.Entry);
-            Entries.Remove(entry);
+            _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

@@ -1,37 +1,10 @@
-using System;
-using Windows.UI.Xaml.Controls;
-using ModernKeePass.Common;
-using ModernKeePass.Interfaces;
+using Windows.UI.Xaml.Controls;
 
 namespace ModernKeePass.ViewModels
 {
-    public class MainMenuItemVm: NotifyPropertyChangedBase, IIsEnabled
+    public class MainMenuItemVm: ListMenuItemVm
     {
-        private string _title;
-        private bool _isSelected;
-
-        public string Title
-        {
-            get { return IsEnabled ? _title : _title + " - Coming soon"; }
-            set { _title = value; }
-        }
-
-        public Type PageType { get; set; }
         public object Parameter { get; set; }
         public Frame Destination { get; set; }
-        public int Group { get; set; } = 0;
-        public Symbol SymbolIcon { get; set; }
-        public bool IsEnabled => PageType != null;
-
-        public bool IsSelected
-        {
-            get { return _isSelected; }
-            set { SetProperty(ref _isSelected, value); }
-        }
-
-        public override string ToString()
-        {
-            return Title;
-        }
     }
 }

ModernKeePass/ViewModels/Items/RecentItemVm.cs

@@ -1,14 +1,15 @@
-using System;
-using Windows.Storage;
+using Windows.Storage;
 using ModernKeePass.Common;
 using Windows.Storage.AccessCache;
+using ModernKeePass.Interfaces;
 
 namespace ModernKeePass.ViewModels
 {
-    public class RecentItemVm: NotifyPropertyChangedBase
+    public class RecentItemVm: NotifyPropertyChangedBase, ISelectableModel
     {
         private bool _isSelected;
 
+        public RecentItemVm() {}
         public RecentItemVm(AccessListEntry entry, StorageFile file)
         {
             Token = entry.Token;
@@ -16,15 +17,15 @@ namespace ModernKeePass.ViewModels
             DatabaseFile = file;
         }
 
-        public StorageFile DatabaseFile { get; private set; }
-        public string Token { get; private set; }
-        public string Name { get; private set; }
-        public string Path => DatabaseFile.Path;
+        public StorageFile DatabaseFile { get; }
+        public string Token { get; }
+        public string Name { get; }
+        public string Path => DatabaseFile?.Path;
 
         public bool IsSelected
         {
             get { return _isSelected; }
-            internal set { SetProperty(ref _isSelected, value); }
+            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

@@ -1,25 +1,29 @@
 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
+    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 MainMenuItemVm SelectedItem
+        public ISelectableModel SelectedItem
         {
             get { return _selectedItem; }
             set
@@ -30,7 +34,7 @@ namespace ModernKeePass.ViewModels
                     _selectedItem.IsSelected = false;
                 }
 
-                SetProperty(ref _selectedItem, value);
+                SetProperty(ref _selectedItem, (MainMenuItemVm)value);
 
                 if (_selectedItem != null)
                 {
@@ -45,6 +49,7 @@ namespace ModernKeePass.ViewModels
         {
             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>
             {
@@ -60,11 +65,15 @@ namespace ModernKeePass.ViewModels
                 new MainMenuItemVm
                 {
                     Title = "Save" , PageType = typeof(SaveDatabasePage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Save,
-                    IsSelected = app.Database != null && app.Database.Status == DatabaseHelper.DatabaseStatus.Opened
+                    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
+                    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

ModernKeePass/ViewModels/NewVm.cs

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

ModernKeePass/ViewModels/OpenVm.cs

@@ -20,14 +20,14 @@ namespace ModernKeePass.ViewModels
 
         public OpenVm()
         {
-            var database = ((App)Application.Current).Database;
-            if (database == null || database.Status != DatabaseHelper.DatabaseStatus.Opening) return;
-            OpenFile(database.DatabaseFile);
+            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;
         
-        private void NotifyPropertyChanged(string propertyName)
+        protected void NotifyPropertyChanged(string propertyName)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

ModernKeePass/ViewModels/RecentVm.cs

@@ -2,12 +2,13 @@
 using System.Collections.ObjectModel;
 using Windows.Storage.AccessCache;
 using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
 
 namespace ModernKeePass.ViewModels
 {
-    public class RecentVm : NotifyPropertyChangedBase
+    public class RecentVm : NotifyPropertyChangedBase, IHasSelectableObject
     {
-        private RecentItemVm _selectedItem;
+        private ISelectableModel _selectedItem;
         private ObservableCollection<RecentItemVm> _recentItems = new ObservableCollection<RecentItemVm>();
 
         public ObservableCollection<RecentItemVm> RecentItems
@@ -16,7 +17,7 @@ namespace ModernKeePass.ViewModels
             set { SetProperty(ref _recentItems, value); }
         }
 
-        public RecentItemVm SelectedItem
+        public ISelectableModel SelectedItem
         {
             get { return _selectedItem; }
             set
@@ -36,6 +37,7 @@ namespace ModernKeePass.ViewModels
 
         public RecentVm()
         {
+            // TODO: opening the files actually changes the MRU order
             var mru = StorageApplicationPermissions.MostRecentlyUsedList;
             foreach (var entry in mru.Entries)
             {

ModernKeePass/ViewModels/SaveVm.cs

@@ -1,34 +1,16 @@
-using System.ComponentModel;
-using Windows.Storage;
+using Windows.Storage;
 using Windows.UI.Xaml;
-using ModernKeePass.Common;
 
 namespace ModernKeePass.ViewModels
 {
-    public class SaveVm: INotifyPropertyChanged
+    public class SaveVm
     {
-        public bool IsSaveEnabled
-        {
-            get
-            {
-                var app = (App)Application.Current;
-                return app.Database.Status == DatabaseHelper.DatabaseStatus.Opened;
-            }
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        private void NotifyPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
         public void Save(bool close = true)
         {
             var app = (App)Application.Current;
             app.Database.Save();
             if (!close) return;
             app.Database.Close();
-            NotifyPropertyChanged("IsSaveEnabled");
         }
 
         internal void Save(StorageFile file)

ModernKeePass/ViewModels/SettingsVm.cs

@@ -0,0 +1,46 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Common;
+using ModernKeePass.Interfaces;
+using ModernKeePass.Pages;
+
+namespace ModernKeePass.ViewModels
+{
+    public class SettingsVM : NotifyPropertyChangedBase, IHasSelectableObject
+    {
+        private ListMenuItemVm _selectedItem;
+
+        public ObservableCollection<ListMenuItemVm> MenuItems { get; set; }
+        public ISelectableModel SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                if (_selectedItem == value) return;
+                if (_selectedItem != null)
+                {
+                    _selectedItem.IsSelected = false;
+                }
+
+                SetProperty(ref _selectedItem, (ListMenuItemVm)value);
+
+                if (_selectedItem != null)
+                {
+                    _selectedItem.IsSelected = true;
+                }
+            }
+        }
+
+        public SettingsVM()
+        {
+            MenuItems = new ObservableCollection<ListMenuItemVm>
+            {
+                new ListMenuItemVm { Title = "Database", SymbolIcon = Symbol.Setting, PageType = typeof(SettingsDatabasePage), IsSelected = true },
+                new ListMenuItemVm { Title = "Security", SymbolIcon = Symbol.Permissions, PageType = typeof(SettingsSecurityPage) },
+                //new ListMenuItemVm { Title = "General", SymbolIcon = Symbol.Edit, PageType = typeof(SettingsGeneralPage) }
+            };
+            SelectedItem = MenuItems.FirstOrDefault(m => m.IsSelected);
+        }
+    }
+}

ModernKeePass/packages.config

@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="win81" />
   <package id="Microsoft.NETCore.Platforms" version="2.0.0" targetFramework="win81" />
   <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.2" targetFramework="win81" />
-  <package id="ModernKeePassLib" version="2.28.4000" targetFramework="win81" />
-  <package id="NETStandard.Library" version="2.0.0" targetFramework="win81" />
+  <package id="Microsoft.Toolkit.Uwp.Notifications" version="2.0.0" targetFramework="win81" />
+  <package id="ModernKeePassLib" version="2.37.5000" targetFramework="win81" />
+  <package id="NETStandard.Library" version="2.0.1" targetFramework="win81" />
   <package id="Portable.BouncyCastle" version="1.8.1.3" targetFramework="win81" />
   <package id="Splat" version="2.0.0" targetFramework="win81" />
-  <package id="System.Collections" version="4.0.11" targetFramework="win81" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="win81" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="win81" />
-  <package id="System.IO" version="4.1.0" targetFramework="win81" />
-  <package id="System.Linq" version="4.1.0" targetFramework="win81" />
+  <package id="System.Collections" version="4.3.0" targetFramework="win81" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="win81" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="win81" />
+  <package id="System.IO" version="4.3.0" targetFramework="win81" />
+  <package id="System.Linq" version="4.3.0" targetFramework="win81" />
   <package id="System.Net.Requests" version="4.3.0" targetFramework="win81" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="win81" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="win81" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="win81" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="win81" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="win81" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="win81" />
   <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="win81" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="win81" />
   <package id="System.Runtime.WindowsRuntime" version="4.3.0" targetFramework="win81" />
-  <package id="System.Text.Encoding" version="4.0.11" targetFramework="win81" />
-  <package id="System.Threading" version="4.0.11" targetFramework="win81" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="win81" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="win81" />
+  <package id="System.Threading" version="4.3.0" targetFramework="win81" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="win81" />
   <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="win81" />
   <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="win81" />
-  <package id="Validation" version="2.4.15" targetFramework="win81" />
+  <package id="Validation" version="2.4.18" targetFramework="win81" />
 </packages>

ModernKeePassLib.Test/Cryptography/Cipher/Chacha20Tests.cs

@@ -0,0 +1,204 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using ModernKeePassLib.Cryptography;
+using ModernKeePassLib.Cryptography.Cipher;
+using ModernKeePassLib.Utility;
+
+namespace ModernKeePassLib.Test.Cryptography.Cipher
+{
+    [TestClass]
+    public class Chacha20Tests
+    {
+        [TestMethod]
+        public void TestChacha20()
+        {
+            // ======================================================
+            // Test vector from RFC 7539, section 2.3.2
+
+            byte[] pbKey = new byte[32];
+            for (int i = 0; i < 32; ++i) pbKey[i] = (byte)i;
+
+            byte[] pbIV = new byte[12];
+            pbIV[3] = 0x09;
+            pbIV[7] = 0x4A;
+
+            byte[] pbExpc = new byte[64] {
+                0x10, 0xF1, 0xE7, 0xE4, 0xD1, 0x3B, 0x59, 0x15,
+                0x50, 0x0F, 0xDD, 0x1F, 0xA3, 0x20, 0x71, 0xC4,
+                0xC7, 0xD1, 0xF4, 0xC7, 0x33, 0xC0, 0x68, 0x03,
+                0x04, 0x22, 0xAA, 0x9A, 0xC3, 0xD4, 0x6C, 0x4E,
+                0xD2, 0x82, 0x64, 0x46, 0x07, 0x9F, 0xAA, 0x09,
+                0x14, 0xC2, 0xD7, 0x05, 0xD9, 0x8B, 0x02, 0xA2,
+                0xB5, 0x12, 0x9C, 0xD1, 0xDE, 0x16, 0x4E, 0xB9,
+                0xCB, 0xD0, 0x83, 0xE8, 0xA2, 0x50, 0x3C, 0x4E
+            };
+
+            byte[] pb = new byte[64];
+
+            using (ChaCha20Cipher c = new ChaCha20Cipher(pbKey, pbIV))
+            {
+                c.Seek(64, SeekOrigin.Begin); // Skip first block
+                c.Encrypt(pb, 0, pb.Length);
+
+                Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));
+            }
+
+#if DEBUG
+            // ======================================================
+            // Test vector from RFC 7539, section 2.4.2
+
+            pbIV[3] = 0;
+
+            pb = StrUtil.Utf8.GetBytes("Ladies and Gentlemen of the clas" +
+                @"s of '99: If I could offer you only one tip for " +
+                @"the future, sunscreen would be it.");
+
+            pbExpc = new byte[] {
+                0x6E, 0x2E, 0x35, 0x9A, 0x25, 0x68, 0xF9, 0x80,
+                0x41, 0xBA, 0x07, 0x28, 0xDD, 0x0D, 0x69, 0x81,
+                0xE9, 0x7E, 0x7A, 0xEC, 0x1D, 0x43, 0x60, 0xC2,
+                0x0A, 0x27, 0xAF, 0xCC, 0xFD, 0x9F, 0xAE, 0x0B,
+                0xF9, 0x1B, 0x65, 0xC5, 0x52, 0x47, 0x33, 0xAB,
+                0x8F, 0x59, 0x3D, 0xAB, 0xCD, 0x62, 0xB3, 0x57,
+                0x16, 0x39, 0xD6, 0x24, 0xE6, 0x51, 0x52, 0xAB,
+                0x8F, 0x53, 0x0C, 0x35, 0x9F, 0x08, 0x61, 0xD8,
+                0x07, 0xCA, 0x0D, 0xBF, 0x50, 0x0D, 0x6A, 0x61,
+                0x56, 0xA3, 0x8E, 0x08, 0x8A, 0x22, 0xB6, 0x5E,
+                0x52, 0xBC, 0x51, 0x4D, 0x16, 0xCC, 0xF8, 0x06,
+                0x81, 0x8C, 0xE9, 0x1A, 0xB7, 0x79, 0x37, 0x36,
+                0x5A, 0xF9, 0x0B, 0xBF, 0x74, 0xA3, 0x5B, 0xE6,
+                0xB4, 0x0B, 0x8E, 0xED, 0xF2, 0x78, 0x5E, 0x42,
+                0x87, 0x4D
+            };
+
+            byte[] pb64 = new byte[64];
+
+            using (ChaCha20Cipher c = new ChaCha20Cipher(pbKey, pbIV))
+            {
+                c.Encrypt(pb64, 0, pb64.Length); // Skip first block
+                c.Encrypt(pb, 0, pb.Length);
+
+                Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));
+            }
+
+            // ======================================================
+            // Test vector from RFC 7539, appendix A.2 #2
+
+            Array.Clear(pbKey, 0, pbKey.Length);
+            pbKey[31] = 1;
+
+            Array.Clear(pbIV, 0, pbIV.Length);
+            pbIV[11] = 2;
+
+            pb = StrUtil.Utf8.GetBytes("Any submission to the IETF inten" +
+                "ded by the Contributor for publication as all or" +
+                " part of an IETF Internet-Draft or RFC and any s" +
+                "tatement made within the context of an IETF acti" +
+                "vity is considered an \"IETF Contribution\". Such " +
+                "statements include oral statements in IETF sessi" +
+                "ons, as well as written and electronic communica" +
+                "tions made at any time or place, which are addressed to");
+
+            pbExpc = MemUtil.HexStringToByteArray(
+                "A3FBF07DF3FA2FDE4F376CA23E82737041605D9F4F4F57BD8CFF2C1D4B7955EC" +
+                "2A97948BD3722915C8F3D337F7D370050E9E96D647B7C39F56E031CA5EB6250D" +
+                "4042E02785ECECFA4B4BB5E8EAD0440E20B6E8DB09D881A7C6132F420E527950" +
+                "42BDFA7773D8A9051447B3291CE1411C680465552AA6C405B7764D5E87BEA85A" +
+                "D00F8449ED8F72D0D662AB052691CA66424BC86D2DF80EA41F43ABF937D3259D" +
+                "C4B2D0DFB48A6C9139DDD7F76966E928E635553BA76C5C879D7B35D49EB2E62B" +
+                "0871CDAC638939E25E8A1E0EF9D5280FA8CA328B351C3C765989CBCF3DAA8B6C" +
+                "CC3AAF9F3979C92B3720FC88DC95ED84A1BE059C6499B9FDA236E7E818B04B0B" +
+                "C39C1E876B193BFE5569753F88128CC08AAA9B63D1A16F80EF2554D7189C411F" +
+                "5869CA52C5B83FA36FF216B9C1D30062BEBCFD2DC5BCE0911934FDA79A86F6E6" +
+                "98CED759C3FF9B6477338F3DA4F9CD8514EA9982CCAFB341B2384DD902F3D1AB" +
+                "7AC61DD29C6F21BA5B862F3730E37CFDC4FD806C22F221");
+
+            using (MemoryStream msEnc = new MemoryStream())
+            {
+                using (ChaCha20Stream c = new ChaCha20Stream(msEnc, true, pbKey, pbIV))
+                {
+                    Random r = CryptoRandom.NewWeakRandom();
+                    r.NextBytes(pb64);
+                    c.Write(pb64, 0, pb64.Length); // Skip first block
+
+                    int p = 0;
+                    while (p < pb.Length)
+                    {
+                        int cb = r.Next(1, pb.Length - p + 1);
+                        c.Write(pb, p, cb);
+                        p += cb;
+                    }
+                    Debug.Assert(p == pb.Length);
+                }
+
+                byte[] pbEnc0 = msEnc.ToArray();
+                byte[] pbEnc = MemUtil.Mid(pbEnc0, 64, pbEnc0.Length - 64);
+                Assert.IsTrue(MemUtil.ArraysEqual(pbEnc, pbExpc));
+
+                using (MemoryStream msCT = new MemoryStream(pbEnc0, false))
+                {
+                    using (ChaCha20Stream cDec = new ChaCha20Stream(msCT, false,
+                        pbKey, pbIV))
+                    {
+                        byte[] pbPT = MemUtil.Read(cDec, pbEnc0.Length);
+
+                        Assert.IsTrue(cDec.ReadByte() < 0);
+                        Assert.IsTrue(MemUtil.ArraysEqual(MemUtil.Mid(pbPT, 0, 64), pb64));
+                        Assert.IsTrue(MemUtil.ArraysEqual(MemUtil.Mid(pbPT, 64, pbEnc.Length), pb));
+                    }
+                }
+            }
+
+            // ======================================================
+            // Test vector TC8 from RFC draft by J. Strombergson:
+            // https://tools.ietf.org/html/draft-strombergson-chacha-test-vectors-01
+
+            pbKey = new byte[32] {
+                0xC4, 0x6E, 0xC1, 0xB1, 0x8C, 0xE8, 0xA8, 0x78,
+                0x72, 0x5A, 0x37, 0xE7, 0x80, 0xDF, 0xB7, 0x35,
+                0x1F, 0x68, 0xED, 0x2E, 0x19, 0x4C, 0x79, 0xFB,
+                0xC6, 0xAE, 0xBE, 0xE1, 0xA6, 0x67, 0x97, 0x5D
+            };
+
+            // The first 4 bytes are set to zero and a large counter
+            // is used; this makes the RFC 7539 version of ChaCha20
+            // compatible with the original specification by
+            // D. J. Bernstein.
+            pbIV = new byte[12] { 0x00, 0x00, 0x00, 0x00,
+                0x1A, 0xDA, 0x31, 0xD5, 0xCF, 0x68, 0x82, 0x21
+            };
+
+            pb = new byte[128];
+
+            pbExpc = new byte[128] {
+                0xF6, 0x3A, 0x89, 0xB7, 0x5C, 0x22, 0x71, 0xF9,
+                0x36, 0x88, 0x16, 0x54, 0x2B, 0xA5, 0x2F, 0x06,
+                0xED, 0x49, 0x24, 0x17, 0x92, 0x30, 0x2B, 0x00,
+                0xB5, 0xE8, 0xF8, 0x0A, 0xE9, 0xA4, 0x73, 0xAF,
+                0xC2, 0x5B, 0x21, 0x8F, 0x51, 0x9A, 0xF0, 0xFD,
+                0xD4, 0x06, 0x36, 0x2E, 0x8D, 0x69, 0xDE, 0x7F,
+                0x54, 0xC6, 0x04, 0xA6, 0xE0, 0x0F, 0x35, 0x3F,
+                0x11, 0x0F, 0x77, 0x1B, 0xDC, 0xA8, 0xAB, 0x92,
+
+                0xE5, 0xFB, 0xC3, 0x4E, 0x60, 0xA1, 0xD9, 0xA9,
+                0xDB, 0x17, 0x34, 0x5B, 0x0A, 0x40, 0x27, 0x36,
+                0x85, 0x3B, 0xF9, 0x10, 0xB0, 0x60, 0xBD, 0xF1,
+                0xF8, 0x97, 0xB6, 0x29, 0x0F, 0x01, 0xD1, 0x38,
+                0xAE, 0x2C, 0x4C, 0x90, 0x22, 0x5B, 0xA9, 0xEA,
+                0x14, 0xD5, 0x18, 0xF5, 0x59, 0x29, 0xDE, 0xA0,
+                0x98, 0xCA, 0x7A, 0x6C, 0xCF, 0xE6, 0x12, 0x27,
+                0x05, 0x3C, 0x84, 0xE4, 0x9A, 0x4A, 0x33, 0x32
+            };
+
+            using (ChaCha20Cipher c = new ChaCha20Cipher(pbKey, pbIV, true))
+            {
+                c.Decrypt(pb, 0, pb.Length);
+
+                Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));
+            }
+#endif
+        }
+    }
+}

ModernKeePassLib.Test/Cryptography/Cipher/StandardAesEngineTests.cs

@@ -1,65 +1,76 @@
-using System;
-using System.IO;
-
-#if KeePassLib
-using KeePassLib.Cryptography.Cipher;
-#else
+using System.IO;
+using System.Text;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using ModernKeePassLib.Serialization;
 using ModernKeePassLib.Cryptography.Cipher;
-#endif
+using ModernKeePassLib.Utility;
+using Org.BouncyCastle.Crypto.Engines;
+using Org.BouncyCastle.Crypto.Parameters;
 
-using NUnit.Framework;
-
-namespace ModernKeePassLib.Test.Shared.Cryptography.Cipher
+namespace ModernKeePassLib.Test.Cryptography.Cipher
 {
-  [TestFixture ()]
+    [TestClass()]
     public class StandardAesEngineTests
-  {
-    [Test ()]
-    public void TestEncryptStream ()
     {
         // Test vector (official ECB test vector #356)
-      var pbIV = new byte[16];
-      var pbTestKey = new byte[32];
-      var pbTestData = new byte[16];
-      var pbReferenceCT = new byte[16] {
+        private byte[] pbReferenceCT = new byte[16] {
           0x75, 0xD1, 0x1B, 0x0E, 0x3A, 0x68, 0xC4, 0x22,
           0x3D, 0x88, 0xDB, 0xF0, 0x17, 0x97, 0x7D, 0xD7
       };
-
+        [TestMethod]
+        public void TestEncryptStream()
+        {
+            byte[] pbIV = new byte[16];
+            byte[] pbTestKey = new byte[32];
+            byte[] pbTestData = new byte[16];
             pbTestData[0] = 0x04;
 
-      var outStream = new MemoryStream (new byte[16]);
-      var aes = new StandardAesEngine ();
-      var inStream = aes.EncryptStream (outStream, pbTestKey, pbIV);
-      new BinaryWriter (inStream).Write (pbTestData);
-      Assert.That (outStream.Position, Is.EqualTo (16));
+            var outStream = new MemoryStream(new byte[16]);
+            var aes = new StandardAesEngine();
+            var inStream = aes.EncryptStream(outStream, pbTestKey, pbIV);
+            new BinaryWriter(inStream).Write(pbTestData);
+            Assert.AreEqual(outStream.Position, 16);
             outStream.Position = 0;
-      var outBytes = new BinaryReader (outStream).ReadBytes (16);
-      Assert.That(outBytes, Is.EqualTo (pbReferenceCT));
+            var outBytes = new BinaryReaderEx(outStream, Encoding.UTF8, string.Empty).ReadBytes(16);
+            Assert.IsTrue(MemUtil.ArraysEqual(outBytes, pbReferenceCT));
         }
 
-    [Test ()]
-    public void TestDecryptStream ()
+        [TestMethod]
+        public void TestDecryptStream()
     {
-      // Test vector (official ECB test vector #356)
-      var pbIV = new byte[16];
-      var pbTestKey = new byte[32];
-      var pbTestData = new byte[16];
-      var pbReferenceCT = new byte[16] {
-        0x75, 0xD1, 0x1B, 0x0E, 0x3A, 0x68, 0xC4, 0x22,
-        0x3D, 0x88, 0xDB, 0xF0, 0x17, 0x97, 0x7D, 0xD7
-      };
-
+            byte[] pbIV = new byte[16];
+            byte[] pbTestKey = new byte[32];
+            byte[] pbTestData = new byte[16];
             pbTestData[0] = 0x04;
 
             // Possible Mono Bug? This only works with size >= 48
-      var inStream = new MemoryStream (new byte[48]);
-      inStream.Write (pbReferenceCT, 0, pbReferenceCT.Length);
+            var inStream = new MemoryStream(new byte[32]);
+            inStream.Write(pbReferenceCT, 0, pbReferenceCT.Length);
             inStream.Position = 0;
-      var aes = new StandardAesEngine ();
-      var outStream = aes.DecryptStream (inStream, pbTestKey, pbIV);
-      var outBytes = new BinaryReader (outStream).ReadBytes (16);
-      Assert.That(outBytes, Is.EqualTo (pbTestData));
+            var aes = new StandardAesEngine();
+            var outStream = aes.DecryptStream(inStream, pbTestKey, pbIV);
+            var outBytes = new BinaryReaderEx(outStream, Encoding.UTF8, string.Empty).ReadBytes(16);
+            Assert.IsTrue(MemUtil.ArraysEqual(outBytes, pbTestData));
+        }
+
+        [TestMethod]
+        public void TestBouncyCastleAes()
+        {
+            byte[] pbIV = new byte[16];
+            byte[] pbTestKey = new byte[32];
+            byte[] pbTestData = new byte[16];
+            /*int i;
+            for (i = 0; i < 16; ++i) pbIV[i] = 0;
+            for (i = 0; i < 32; ++i) pbTestKey[i] = 0;
+            for (i = 0; i < 16; ++i) pbTestData[i] = 0;*/
+            pbTestData[0] = 0x04;
+
+            var aesEngine = new AesEngine();
+            //var parametersWithIv = new ParametersWithIV(new KeyParameter(pbTestKey), pbIV);
+            aesEngine.Init(true, new KeyParameter(pbTestKey));
+            Assert.AreEqual(aesEngine.GetBlockSize(), pbTestData.Length);
+            aesEngine.ProcessBlock(pbTestData, 0, pbTestData, 0);
+            Assert.IsTrue(MemUtil.ArraysEqual(pbTestData, pbReferenceCT));
         }
     }
 }

ModernKeePassLib.Test/Cryptography/CryptoRandomStreamTests.cs

@@ -1,59 +1,55 @@
-using NUnit.Framework;
-using System;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 
-#if KeePassLib
-using KeePassLib.Cryptography;
-#else
 using ModernKeePassLib.Cryptography;
-#endif
+using ModernKeePassLib.Utility;
 
-namespace ModernKeePassLib.Test.Shared.Cryptography
+namespace ModernKeePassLib.Test.Cryptography
 {
-  [TestFixture ()]
+    [TestClass]
     public class CryptoRandomStreamTests
     {
-    void TestGetRandomBytes(CryptoRandomStream stream)
+        private void TestGetRandomBytes(CryptoRandomStream stream)
         {
             const uint length = 16;
-      var bytes1 = stream.GetRandomBytes (length);
-      Assert.That (bytes1.Length, Is.EqualTo (length));
-      var bytes2 = stream.GetRandomBytes (length);
-      Assert.That (bytes2, Is.Not.EqualTo (bytes1));
+            var bytes1 = stream.GetRandomBytes(length);
+            Assert.AreEqual(bytes1.Length, (int)length);
+            var bytes2 = stream.GetRandomBytes(length);
+            Assert.IsFalse(MemUtil.ArraysEqual(bytes2, bytes1));
         }
 
-    [Test ()]
-    public void TestGetRandomBytesCrsAlgorithmSalsa20 ()
+        [TestMethod]
+        public void TestGetRandomBytesCrsAlgorithmSalsa20()
         {
-      var stream = new CryptoRandomStream (CrsAlgorithm.Salsa20, new byte[16]);
-      TestGetRandomBytes (stream);
+            var stream = new CryptoRandomStream(CrsAlgorithm.Salsa20, new byte[16]);
+            TestGetRandomBytes(stream);
         }
 
-    [Test ()]
-    public void TestGetRandomBytesCrsAlgorithmArcFourVariant ()
+        [TestMethod]
+        public void TestGetRandomBytesCrsAlgorithmArcFourVariant()
         {
-      var stream = new CryptoRandomStream (CrsAlgorithm.ArcFourVariant, new byte[16]);
-      TestGetRandomBytes (stream);
+            var stream = new CryptoRandomStream(CrsAlgorithm.ArcFourVariant, new byte[16]);
+            TestGetRandomBytes(stream);
         }
 
-    void TestGetRandomInt64 (CryptoRandomStream stream)
+        private void TestGetRandomInt64(CryptoRandomStream stream)
         {
-      var value1 = stream.GetRandomUInt64 ();
-      var value2 = stream.GetRandomUInt64 ();
-      Assert.That (value2, Is.Not.EqualTo (value1));
+            var value1 = stream.GetRandomUInt64();
+            var value2 = stream.GetRandomUInt64();
+            Assert.AreNotEqual(value2, value1);
         }
 
-    [Test ()]
-    public void TestGetRandomInt64AlgorithmSalsa20 ()
+        [TestMethod]
+        public void TestGetRandomInt64AlgorithmSalsa20()
         {
-      var stream = new CryptoRandomStream (CrsAlgorithm.Salsa20, new byte[16]);
-      TestGetRandomInt64 (stream);
+            var stream = new CryptoRandomStream(CrsAlgorithm.Salsa20, new byte[16]);
+            TestGetRandomInt64(stream);
         }
 
-    [Test ()]
-    public void TestGetRandomInt64AlgorithmArcFourVariant ()
+        [TestMethod]
+        public void TestGetRandomInt64AlgorithmArcFourVariant()
         {
-      var stream = new CryptoRandomStream (CrsAlgorithm.ArcFourVariant, new byte[16]);
-      TestGetRandomInt64 (stream);
+            var stream = new CryptoRandomStream(CrsAlgorithm.ArcFourVariant, new byte[16]);
+            TestGetRandomInt64(stream);
         }
     }
 }

ModernKeePassLib.Test/Cryptography/CryptoRandomTests.cs

@@ -1,43 +1,37 @@
-using NUnit.Framework;
-using System;
-
-#if KeePassLib
-using KeePassLib.Cryptography;
-#else
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using ModernKeePassLib.Cryptography;
-#endif
 
-namespace ModernKeePassLib.Test.Shared.Cryptography
+namespace ModernKeePassLib.Test.Cryptography
 {
-  [TestFixture ()]
+    [TestClass()]
     public class CryptoRandomTests
     {
-    [Test ()]
-    public void TestAddEntropy ()
+        [TestMethod]
+        public void TestAddEntropy()
         {
             // just making sure it does not throw an exception
-      CryptoRandom.Instance.AddEntropy (new byte[1]);
+            CryptoRandom.Instance.AddEntropy(new byte[1]);
         }
 
-    [Test ()]
-    public void TestGetRandomBytes ()
+        [TestMethod]
+        public void TestGetRandomBytes()
         {
             const int length = 32;
-      var bytes1 = CryptoRandom.Instance.GetRandomBytes (length);
-      Assert.That (bytes1.Length, Is.EqualTo (length));
-      var bytes2 = CryptoRandom.Instance.GetRandomBytes (length);
-      Assert.That (bytes2, Is.Not.EqualTo (bytes1));
+            var bytes1 = CryptoRandom.Instance.GetRandomBytes(length);
+            Assert.AreEqual(bytes1.Length, length);
+            var bytes2 = CryptoRandom.Instance.GetRandomBytes(length);
+            Assert.AreNotEqual(bytes2, bytes1);
         }
 
-    [Test ()]
-    public void TestGeneratedBytesCount ()
+        [TestMethod]
+        public void TestGeneratedBytesCount()
         {
             const int length = 1;
-      CryptoRandom.Instance.GetRandomBytes (length);
+            CryptoRandom.Instance.GetRandomBytes(length);
             var count1 = CryptoRandom.Instance.GeneratedBytesCount;
-      CryptoRandom.Instance.GetRandomBytes (length);
+            CryptoRandom.Instance.GetRandomBytes(length);
             var count2 = CryptoRandom.Instance.GeneratedBytesCount;
-      Assert.That (count2, Is.GreaterThan (count1));
+            Assert.IsTrue(count2 > count1);
         }
     }
 }

ModernKeePassLib.Test/Cryptography/Hash/Blake2bTests.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Text;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using ModernKeePassLib.Cryptography;
+using ModernKeePassLib.Cryptography.Hash;
+using ModernKeePassLib.Utility;
+
+namespace ModernKeePassLib.Test.Cryptography.Hash
+{
+    [TestClass]
+    public class Blake2bTests
+    {
+        [TestMethod]
+        public void TestBlake2bUtf8()
+        {
+            Blake2b h = new Blake2b();
+
+            // ======================================================
+            // From https://tools.ietf.org/html/rfc7693
+
+            byte[] pbData = StrUtil.Utf8.GetBytes("abc");
+            byte[] pbExpc = new byte[64]
+            {
+                0xBA, 0x80, 0xA5, 0x3F, 0x98, 0x1C, 0x4D, 0x0D,
+                0x6A, 0x27, 0x97, 0xB6, 0x9F, 0x12, 0xF6, 0xE9,
+                0x4C, 0x21, 0x2F, 0x14, 0x68, 0x5A, 0xC4, 0xB7,
+                0x4B, 0x12, 0xBB, 0x6F, 0xDB, 0xFF, 0xA2, 0xD1,
+                0x7D, 0x87, 0xC5, 0x39, 0x2A, 0xAB, 0x79, 0x2D,
+                0xC2, 0x52, 0xD5, 0xDE, 0x45, 0x33, 0xCC, 0x95,
+                0x18, 0xD3, 0x8A, 0xA8, 0xDB, 0xF1, 0x92, 0x5A,
+                0xB9, 0x23, 0x86, 0xED, 0xD4, 0x00, 0x99, 0x23
+            };
+
+            byte[] pbC = h.ComputeHash(pbData);
+            Assert.IsTrue(MemUtil.ArraysEqual(pbC, pbExpc));
+        }
+
+        [TestMethod]
+        public void TestBlake2bEmpty()
+        {
+            // ======================================================
+            // Computed using the official b2sum tool
+            Blake2b h = new Blake2b();
+
+            var pbExpc = new byte[64]
+            {
+                0x78, 0x6A, 0x02, 0xF7, 0x42, 0x01, 0x59, 0x03,
+                0xC6, 0xC6, 0xFD, 0x85, 0x25, 0x52, 0xD2, 0x72,
+                0x91, 0x2F, 0x47, 0x40, 0xE1, 0x58, 0x47, 0x61,
+                0x8A, 0x86, 0xE2, 0x17, 0xF7, 0x1F, 0x54, 0x19,
+                0xD2, 0x5E, 0x10, 0x31, 0xAF, 0xEE, 0x58, 0x53,
+                0x13, 0x89, 0x64, 0x44, 0x93, 0x4E, 0xB0, 0x4B,
+                0x90, 0x3A, 0x68, 0x5B, 0x14, 0x48, 0xB7, 0x55,
+                0xD5, 0x6F, 0x70, 0x1A, 0xFE, 0x9B, 0xE2, 0xCE
+            };
+
+            var pbC = h.ComputeHash(MemUtil.EmptyByteArray);
+            Assert.IsTrue(MemUtil.ArraysEqual(pbC, pbExpc));
+        }
+
+        [TestMethod]
+        public void TestBlake2bString()
+        { 
+        // ======================================================
+            // Computed using the official b2sum tool
+            Blake2b h = new Blake2b();
+
+            string strS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.:,;_-\r\n";
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < 1000; ++i) sb.Append(strS);
+            var pbData = StrUtil.Utf8.GetBytes(sb.ToString());
+
+            var pbExpc = new byte[64] {
+                0x59, 0x69, 0x8D, 0x3B, 0x83, 0xF4, 0x02, 0x4E,
+                0xD8, 0x99, 0x26, 0x0E, 0xF4, 0xE5, 0x9F, 0x20,
+                0xDC, 0x31, 0xEE, 0x5B, 0x45, 0xEA, 0xBB, 0xFC,
+                0x1C, 0x0A, 0x8E, 0xED, 0xAA, 0x7A, 0xFF, 0x50,
+                0x82, 0xA5, 0x8F, 0xBC, 0x4A, 0x46, 0xFC, 0xC5,
+                0xEF, 0x44, 0x4E, 0x89, 0x80, 0x7D, 0x3F, 0x1C,
+                0xC1, 0x94, 0x45, 0xBB, 0xC0, 0x2C, 0x95, 0xAA,
+                0x3F, 0x08, 0x8A, 0x93, 0xF8, 0x75, 0x91, 0xB0
+            };
+
+            Random r = CryptoRandom.NewWeakRandom();
+            int p = 0;
+            while (p < pbData.Length)
+            {
+                int cb = r.Next(1, pbData.Length - p + 1);
+                h.TransformBlock(pbData, p, cb, pbData, p);
+                p += cb;
+            }
+            Assert.AreEqual(p, pbData.Length);
+
+            h.TransformFinalBlock(MemUtil.EmptyByteArray, 0, 0);
+
+            Assert.IsTrue(MemUtil.ArraysEqual(h.Hash, pbExpc));
+
+            h.Clear();
+        }
+    }
+}

ModernKeePassLib.Test/Cryptography/Hash/HmacTests.cs

@@ -0,0 +1,117 @@
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using ModernKeePassLib.Cryptography;
+using ModernKeePassLib.Cryptography.Hash;
+using ModernKeePassLib.Utility;
+
+namespace ModernKeePassLib.Test.Cryptography.Hash
+{
+    [TestClass]
+    public class HmacTests
+    {
+        [TestMethod]
+        public void TestHmac1()
+        {
+            // Test vectors from RFC 4231
+
+            var pbKey = new byte[20];
+            for (var i = 0; i < pbKey.Length; ++i) pbKey[i] = 0x0B;
+            var pbMsg = StrUtil.Utf8.GetBytes("Hi There");
+            var pbExpc = new byte[]
+            {
+                0xB0, 0x34, 0x4C, 0x61, 0xD8, 0xDB, 0x38, 0x53,
+                0x5C, 0xA8, 0xAF, 0xCE, 0xAF, 0x0B, 0xF1, 0x2B,
+                0x88, 0x1D, 0xC2, 0x00, 0xC9, 0x83, 0x3D, 0xA7,
+                0x26, 0xE9, 0x37, 0x6C, 0x2E, 0x32, 0xCF, 0xF7
+            };
+            HmacEval(pbKey, pbMsg, pbExpc);
+        }
+
+        [TestMethod]
+        public void TestHmac2()
+        {
+            var pbKey = new byte[131];
+            for (var i = 0; i < pbKey.Length; ++i) pbKey[i] = 0xAA;
+            var pbMsg = StrUtil.Utf8.GetBytes(
+                "This is a test using a larger than block-size key and " +
+                "a larger than block-size data. The key needs to be " +
+                "hashed before being used by the HMAC algorithm.");
+            var pbExpc = new byte[] {
+                0x9B, 0x09, 0xFF, 0xA7, 0x1B, 0x94, 0x2F, 0xCB,
+                0x27, 0x63, 0x5F, 0xBC, 0xD5, 0xB0, 0xE9, 0x44,
+                0xBF, 0xDC, 0x63, 0x64, 0x4F, 0x07, 0x13, 0x93,
+                0x8A, 0x7F, 0x51, 0x53, 0x5C, 0x3A, 0x35, 0xE2
+            };
+            HmacEval(pbKey, pbMsg, pbExpc);
+        }
+
+        [TestMethod]
+        public void TestHmacSha1ComputeHash()
+        {
+            var expectedHash = "AC2C2E614882CE7158F69B7E3B12114465945D01";
+            var message = StrUtil.Utf8.GetBytes("testing123");
+            var key = StrUtil.Utf8.GetBytes("hello");
+            using (var result = new HMACSHA1(key))
+            {
+                Assert.AreEqual(ByteToString(result.ComputeHash(message)), expectedHash);
+            }
+        }
+
+        [TestMethod]
+        public void TestHmacSha256ComputeHash()
+        {
+            var expectedHash = "09C1BD2DE4E5659C0EFAF9E6AE4723E9CF96B69609B4E562F6AFF1745D7BF4E0";
+            var message = StrUtil.Utf8.GetBytes("testing123");
+            var key = StrUtil.Utf8.GetBytes("hello");
+            using (var result = new HMACSHA256(key))
+            {
+                Assert.AreEqual(ByteToString(result.ComputeHash(message)), expectedHash);
+            }
+        }
+
+        private static string ByteToString(byte[] buff)
+        {
+            string sbinary = "";
+
+            for (int i = 0; i < buff.Length; i++)
+            {
+                sbinary += buff[i].ToString("X2"); // hex format
+            }
+            return (sbinary);
+        }
+
+        [TestMethod]
+        public void TestHmacOtp()
+        {
+            var pbSecret = StrUtil.Utf8.GetBytes("12345678901234567890");
+            var vExp = new []{ "755224", "287082", "359152",
+                "969429", "338314", "254676", "287922", "162583", "399871",
+                "520489" };
+
+            for (var i = 0; i < vExp.Length; ++i)
+            {
+                Assert.AreEqual(HmacOtp.Generate(pbSecret, (ulong)i, 6, false, -1), vExp[i]);
+            }
+        }
+
+        private static void HmacEval(byte[] pbKey, byte[] pbMsg,
+            byte[] pbExpc)
+        {
+            using (var h = new HMACSHA256(pbKey))
+            {
+                h.TransformBlock(pbMsg, 0, pbMsg.Length, pbMsg, 0);
+                h.TransformFinalBlock(MemUtil.EmptyByteArray, 0, 0);
+
+                byte[] pbHash = h.Hash;
+                Assert.IsTrue(MemUtil.ArraysEqual(pbHash, pbExpc));
+
+                // Reuse the object
+                h.Initialize();
+                h.TransformBlock(pbMsg, 0, pbMsg.Length, pbMsg, 0);
+                h.TransformFinalBlock(MemUtil.EmptyByteArray, 0, 0);
+
+                pbHash = h.Hash;
+                Assert.IsTrue(MemUtil.ArraysEqual(pbHash, pbExpc));
+            }
+        }
+    }
+}

ModernKeePassLib.Test/Cryptography/Hash/SHAManagedTests.cs

@@ -0,0 +1,42 @@
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using ModernKeePassLib.Cryptography.Hash;
+using ModernKeePassLib.Utility;
+
+namespace ModernKeePassLib.Test.Cryptography.Hash
+{
+    [TestClass]
+    public class SHAManagedTests
+    {
+        [TestMethod]
+        public void TestSha256ComputeHash()
+        {
+            var expectedHash = "B822F1CD2DCFC685B47E83E3980289FD5D8E3FF3A82DEF24D7D1D68BB272EB32";
+            var message = StrUtil.Utf8.GetBytes("testing123");
+            using (var result = new SHA256Managed())
+            {
+                Assert.AreEqual(ByteToString(result.ComputeHash(message)), expectedHash);
+            }
+        }
+
+        [TestMethod]
+        public void TestSha512ComputeHash()
+        {
+            var expectedHash = "4120117B3190BA5E24044732B0B09AA9ED50EB1567705ABCBFA78431A4E0A96B1152ED7F4925966B1C82325E186A8100E692E6D2FCB6702572765820D25C7E9E";
+            var message = StrUtil.Utf8.GetBytes("testing123");
+            using (var result = new SHA512Managed())
+            {
+                Assert.AreEqual(ByteToString(result.ComputeHash(message)), expectedHash);
+            }
+        }
+        private static string ByteToString(byte[] buff)
+        {
+            string sbinary = "";
+
+            for (int i = 0; i < buff.Length; i++)
+            {
+                sbinary += buff[i].ToString("X2"); // hex format
+            }
+            return (sbinary);
+        }
+    }
+}

ModernKeePassLib.Test/Cryptography/HashingStreamExTests.cs

@@ -1,74 +1,80 @@
-using NUnit.Framework;
-using System;
-using System.IO;
-using System.Text;
+using System.IO;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 
-#if KeePassLib
-using KeePassLib.Cryptography;
-#else
 using ModernKeePassLib.Cryptography;
-#endif
+using ModernKeePassLib.Utility;
 
-namespace ModernKeePassLib.Test.Shared.Cryptography
+namespace ModernKeePassLib.Test.Cryptography
 {
-  [TestFixture ()]
+    [TestClass()]
     public class HashingStreamExTests
     {
         const string data = "test";
 
         // The expected hash includes the \n added by WriteLine
-    static readonly byte[] sha256HashOfData = {
+        static readonly byte[] sha256HashOfData =
+        {
             0xf2, 0xca, 0x1b, 0xb6, 0xc7, 0xe9, 0x07, 0xd0,
             0x6d, 0xaf, 0xe4, 0x68, 0x7e, 0x57, 0x9f, 0xce,
             0x76, 0xb3, 0x7e, 0x4e, 0x93, 0xb7, 0x60, 0x50,
             0x22, 0xda, 0x52, 0xe6, 0xcc, 0xc2, 0x6f, 0xd2
         };
 
-    [Test ()]
-    public void TestRead ()
+        [TestMethod]
+        public void TestRead()
         {
             // if we use larger size, StreamReader will read past newline and cause bad hash
             var bytes = new byte[data.Length + 1];
-      using (var ms = new MemoryStream (bytes)) {
-        using (var sw = new StreamWriter (ms)) {
+            using (var ms = new MemoryStream(bytes))
+            {
+                using (var sw = new StreamWriter(ms))
+                {
                     // set NewLine to ensure we don't run into cross-platform issues on Windows
                     sw.NewLine = "\n";
-          sw.WriteLine (data);
+                    sw.WriteLine(data);
                 }
             }
-      using (var ms = new MemoryStream (bytes)) {
-        using (var hs = new HashingStreamEx (ms, false, null)) {
-          using (var sr = new StreamReader (hs)) {
-            var read = sr.ReadLine ();
-            Assert.That (read, Is.EqualTo (data));
+            using (var ms = new MemoryStream(bytes))
+            {
+                using (var hs = new HashingStreamEx(ms, false, null))
+                {
+                    using (var sr = new StreamReader(hs))
+                    {
+                        var read = sr.ReadLine();
+                        Assert.AreEqual(read, data);
                     }
                     // When the StreamReader is disposed, it calls Dispose on the
                     //HasingStreamEx, which computes the hash.
-          Assert.That (hs.Hash, Is.EqualTo (sha256HashOfData));
+                    Assert.IsTrue(MemUtil.ArraysEqual(hs.Hash, sha256HashOfData));
                 }
             }
         }
 
-    [Test ()]
-    public void TestWrite ()
+        [TestMethod]
+        public void TestWrite()
         {
             var bytes = new byte[16];
-      using (var ms = new MemoryStream (bytes)) {
-        using (var hs = new HashingStreamEx (ms, true, null)) {
-          using (var sw = new StreamWriter (hs)) {
+            using (var ms = new MemoryStream(bytes))
+            {
+                using (var hs = new HashingStreamEx(ms, true, null))
+                {
+                    using (var sw = new StreamWriter(hs))
+                    {
                         // set NewLine to ensure we don't run into cross-platform issues on Windows
                         sw.NewLine = "\n";
-            sw.WriteLine (data);
+                        sw.WriteLine(data);
                     }
                     // When the StreamWriter is disposed, it calls Dispose on the
                     //HasingStreamEx, which computes the hash.
-          Assert.That (hs.Hash, Is.EqualTo (sha256HashOfData));
+                    Assert.IsTrue(MemUtil.ArraysEqual(hs.Hash, sha256HashOfData));
                 }
             }
-      using (var ms = new MemoryStream (bytes)) {
-        using (var sr = new StreamReader (ms)) {
-          var read = sr.ReadLine ();
-          Assert.That (read, Is.EqualTo (data));
+            using (var ms = new MemoryStream(bytes))
+            {
+                using (var sr = new StreamReader(ms))
+                {
+                    var read = sr.ReadLine();
+                    Assert.AreEqual(read, data);
                 }
             }
         }

ModernKeePassLib.Test/Cryptography/HmacOtpTests.cs

@@ -1,36 +1,32 @@
-using NUnit.Framework;
-using System;
-using System.Text;
-
-#if KeePassLib
-using KeePassLib.Cryptography;
-#else
+using System.Text;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using ModernKeePassLib.Cryptography;
-#endif
 
-namespace ModernKeePassLib.Test.Shared.Cryptography
+namespace ModernKeePassLib.Test.Cryptography
 {
-  [TestFixture ()]
+    [TestClass()]
     public class HmacOtpTests
     {
         // Using the test case from Appendix D of RFC 4226
 
         const string secret = "12345678901234567890";
-    static readonly string[] expectedHOTP = new string[] {
+
+        static readonly string[] expectedHOTP = new string[]
+        {
             "755224", "287082", "359152", "969429", "338314",
             "254676", "287922", "162583", "399871", "520489"
         };
 
-    [Test ()]
-    public void TestGenerate ()
+        [TestMethod]
+        public void TestGenerate()
         {
-      var secretBytes = Encoding.UTF8.GetBytes (secret);
+            var secretBytes = Encoding.UTF8.GetBytes(secret);
 
-      for (ulong i = 0; i < 10; i++) {
-        var hotp = HmacOtp.Generate (secretBytes, i, 6, false, -1);
-        Assert.That (hotp, Is.EqualTo (expectedHOTP[i]));
+            for (ulong i = 0; i < 10; i++)
+            {
+                var hotp = HmacOtp.Generate(secretBytes, i, 6, false, -1);
+                Assert.AreEqual(hotp, expectedHOTP[i]);
             }
         }
     }
 }
-

ModernKeePassLib.Test/Cryptography/KeyDerivation/AesKdfTests.cs

@@ -0,0 +1,42 @@
+using System;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using ModernKeePassLib.Cryptography;
+using ModernKeePassLib.Cryptography.KeyDerivation;
+using ModernKeePassLib.Utility;
+
+namespace ModernKeePassLib.Test.Cryptography.KeyDerivation
+{
+    [TestClass]
+    public class AesKdfTests
+    {
+        [TestMethod]
+        public void TestAesKdf()
+        {
+            // Up to KeePass 2.34, the OtpKeyProv plugin used the public
+            // CompositeKey.TransformKeyManaged method (and a finalizing
+            // SHA-256 computation), which became an internal method of
+            // the AesKdf class in KeePass 2.35, thus OtpKeyProv now
+            // uses the AesKdf class; here we ensure that the results
+            // are the same
+            var r = CryptoRandom.NewWeakRandom();
+            var pbKey = new byte[32];
+            r.NextBytes(pbKey);
+            var pbSeed = new byte[32];
+            r.NextBytes(pbSeed);
+            var uRounds = (ulong)r.Next(1, 0x7FFF);
+
+            var pbMan = new byte[pbKey.Length];
+            Array.Copy(pbKey, pbMan, pbKey.Length);
+            Assert.IsTrue(AesKdf.TransformKeyManaged(pbMan, pbSeed, uRounds));
+            pbMan = CryptoUtil.HashSha256(pbMan);
+
+            var kdf = new AesKdf();
+            var p = kdf.GetDefaultParameters();
+            p.SetUInt64(AesKdf.ParamRounds, uRounds);
+            p.SetByteArray(AesKdf.ParamSeed, pbSeed);
+            var pbKdf = kdf.Transform(pbKey, p);
+
+            Assert.IsTrue(MemUtil.ArraysEqual(pbMan, pbKdf));
+        }
+    }
+}

ModernKeePassLib.Test/Cryptography/KeyDerivation/Argon2Tests.cs

@@ -0,0 +1,146 @@
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using ModernKeePassLib.Cryptography.KeyDerivation;
+using ModernKeePassLib.Utility;
+
+namespace ModernKeePassLib.Test.Cryptography.KeyDerivation
+{
+    [TestClass]
+    public class Argon2Tests
+    {
+        [TestMethod]
+        public void TestArgon2()
+        {
+            Argon2Kdf kdf = new Argon2Kdf();
+
+            // ======================================================
+            // From the official Argon2 1.3 reference code package
+            // (test vector for Argon2d 1.3); also on
+            // https://tools.ietf.org/html/draft-irtf-cfrg-argon2-00
+
+            var p = kdf.GetDefaultParameters();
+            kdf.Randomize(p);
+
+            Assert.AreEqual(p.GetUInt32(Argon2Kdf.ParamVersion, 0), 0x13U);
+
+            byte[] pbMsg = new byte[32];
+            for (int i = 0; i < pbMsg.Length; ++i) pbMsg[i] = 1;
+
+            p.SetUInt64(Argon2Kdf.ParamMemory, 32 * 1024);
+            p.SetUInt64(Argon2Kdf.ParamIterations, 3);
+            p.SetUInt32(Argon2Kdf.ParamParallelism, 4);
+
+            byte[] pbSalt = new byte[16];
+            for (int i = 0; i < pbSalt.Length; ++i) pbSalt[i] = 2;
+            p.SetByteArray(Argon2Kdf.ParamSalt, pbSalt);
+
+            byte[] pbKey = new byte[8];
+            for (int i = 0; i < pbKey.Length; ++i) pbKey[i] = 3;
+            p.SetByteArray(Argon2Kdf.ParamSecretKey, pbKey);
+
+            byte[] pbAssoc = new byte[12];
+            for (int i = 0; i < pbAssoc.Length; ++i) pbAssoc[i] = 4;
+            p.SetByteArray(Argon2Kdf.ParamAssocData, pbAssoc);
+
+            byte[] pbExpc = new byte[32] {
+                0x51, 0x2B, 0x39, 0x1B, 0x6F, 0x11, 0x62, 0x97,
+                0x53, 0x71, 0xD3, 0x09, 0x19, 0x73, 0x42, 0x94,
+                0xF8, 0x68, 0xE3, 0xBE, 0x39, 0x84, 0xF3, 0xC1,
+                0xA1, 0x3A, 0x4D, 0xB9, 0xFA, 0xBE, 0x4A, 0xCB
+            };
+
+            byte[] pb = kdf.Transform(pbMsg, p);
+
+            Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));
+
+            // ======================================================
+            // From the official Argon2 1.3 reference code package
+            // (test vector for Argon2d 1.0)
+
+            p.SetUInt32(Argon2Kdf.ParamVersion, 0x10);
+
+            pbExpc = new byte[32] {
+                0x96, 0xA9, 0xD4, 0xE5, 0xA1, 0x73, 0x40, 0x92,
+                0xC8, 0x5E, 0x29, 0xF4, 0x10, 0xA4, 0x59, 0x14,
+                0xA5, 0xDD, 0x1F, 0x5C, 0xBF, 0x08, 0xB2, 0x67,
+                0x0D, 0xA6, 0x8A, 0x02, 0x85, 0xAB, 0xF3, 0x2B
+            };
+
+            pb = kdf.Transform(pbMsg, p);
+
+            Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));
+
+            // ======================================================
+            // From the official 'phc-winner-argon2-20151206.zip'
+            // (test vector for Argon2d 1.0)
+
+            p.SetUInt64(Argon2Kdf.ParamMemory, 16 * 1024);
+
+            pbExpc = new byte[32] {
+                0x57, 0xB0, 0x61, 0x3B, 0xFD, 0xD4, 0x13, 0x1A,
+                0x0C, 0x34, 0x88, 0x34, 0xC6, 0x72, 0x9C, 0x2C,
+                0x72, 0x29, 0x92, 0x1E, 0x6B, 0xBA, 0x37, 0x66,
+                0x5D, 0x97, 0x8C, 0x4F, 0xE7, 0x17, 0x5E, 0xD2
+            };
+
+            pb = kdf.Transform(pbMsg, p);
+
+            Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));
+            
+			// ======================================================
+			// Computed using the official 'argon2' application
+			// (test vectors for Argon2d 1.3)
+
+			p = kdf.GetDefaultParameters();
+
+			pbMsg = StrUtil.Utf8.GetBytes("ABC1234");
+
+			p.SetUInt64(Argon2Kdf.ParamMemory, (1 << 11) * 1024); // 2 MB
+			p.SetUInt64(Argon2Kdf.ParamIterations, 2);
+			p.SetUInt32(Argon2Kdf.ParamParallelism, 2);
+
+			pbSalt = StrUtil.Utf8.GetBytes("somesalt");
+			p.SetByteArray(Argon2Kdf.ParamSalt, pbSalt);
+
+			pbExpc = new byte[32] {
+				0x29, 0xCB, 0xD3, 0xA1, 0x93, 0x76, 0xF7, 0xA2,
+				0xFC, 0xDF, 0xB0, 0x68, 0xAC, 0x0B, 0x99, 0xBA,
+				0x40, 0xAC, 0x09, 0x01, 0x73, 0x42, 0xCE, 0xF1,
+				0x29, 0xCC, 0xA1, 0x4F, 0xE1, 0xC1, 0xB7, 0xA3
+			};
+
+			pb = kdf.Transform(pbMsg, p);
+
+            Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));
+
+			p.SetUInt64(Argon2Kdf.ParamMemory, (1 << 10) * 1024); // 1 MB
+			p.SetUInt64(Argon2Kdf.ParamIterations, 3);
+
+			pbExpc = new byte[32] {
+				0x7A, 0xBE, 0x1C, 0x1C, 0x8D, 0x7F, 0xD6, 0xDC,
+				0x7C, 0x94, 0x06, 0x3E, 0xD8, 0xBC, 0xD8, 0x1C,
+				0x2F, 0x87, 0x84, 0x99, 0x12, 0x83, 0xFE, 0x76,
+				0x00, 0x64, 0xC4, 0x58, 0xA4, 0xDA, 0x35, 0x70
+			};
+
+			pb = kdf.Transform(pbMsg, p);
+
+            Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));
+            
+            // TODO: Out of memory exception
+			/*p.SetUInt64(Argon2Kdf.ParamMemory, (1 << 20) * 1024); // 1 GB
+			p.SetUInt64(Argon2Kdf.ParamIterations, 2);
+			p.SetUInt32(Argon2Kdf.ParamParallelism, 3);
+
+			pbExpc = new byte[32] {
+				0xE6, 0xE7, 0xCB, 0xF5, 0x5A, 0x06, 0x93, 0x05,
+				0x32, 0xBA, 0x86, 0xC6, 0x1F, 0x45, 0x17, 0x99,
+				0x65, 0x41, 0x77, 0xF9, 0x30, 0x55, 0x9A, 0xE8,
+				0x3D, 0x21, 0x48, 0xC6, 0x2D, 0x0C, 0x49, 0x11
+			};
+
+			pb = kdf.Transform(pbMsg, p);
+
+            Assert.IsTrue(MemUtil.ArraysEqual(pb, pbExpc));*/
+        }
+    }
+}

ModernKeePassLib.Test/Keys/CompositeKeyTests.cs

@@ -1,22 +1,19 @@
-using NUnit.Framework;
-using System;
-
-#if KeePassLib
-using KeePassLib.Keys;
-#else
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using ModernKeePassLib.Cryptography.KeyDerivation;
 using ModernKeePassLib.Keys;
-#endif
+using ModernKeePassLib.Utility;
 
-namespace ModernKeePassLib.Test.Shared.Keys
+namespace ModernKeePassLib.Test.Keys
 {
-  [TestFixture ()]
+    [TestClass()]
     public class CompositeKeyTests
     {
-    [Test ()]
-    public void TestGenerateKey32 ()
+        [TestMethod]
+        public void TestGenerateKey32()
         {
             var originalKey = new byte[32];
-      var expectedKey = new byte[32] {
+            var expectedKey = new byte[32]
+            {
                 0xF0, 0xED, 0x57, 0xD5, 0xF0, 0xDA, 0xF3, 0x47,
                 0x90, 0xD0, 0xDB, 0x43, 0x25, 0xC6, 0x81, 0x2C,
                 0x81, 0x6A, 0x0D, 0x94, 0x96, 0xA9, 0x03, 0xE1,
@@ -24,11 +21,15 @@ namespace ModernKeePassLib.Test.Shared.Keys
             };
             const ulong rounds = 1;
 
-      var composite = new CompositeKey ();
-      var key = composite.GenerateKey32 (originalKey, rounds);
-      Assert.That (key, Is.Not.Null);
-      var keyData = key.ReadData ();
-      Assert.That (keyData, Is.EqualTo (expectedKey));
+            var composite = new CompositeKey();
+            AesKdf kdf = new AesKdf();
+            KdfParameters p = kdf.GetDefaultParameters();
+            p.SetUInt64(AesKdf.ParamRounds, rounds);
+            p.SetByteArray(AesKdf.ParamSeed, originalKey);
+            var key = composite.GenerateKey32(p);
+            Assert.IsNotNull(key);
+            var keyData = key.ReadData();
+            Assert.IsTrue(MemUtil.ArraysEqual(keyData, expectedKey));
         }
     }
 }

ModernKeePassLib.Test/Keys/KcpCustomKeyTests.cs

@@ -1,39 +1,35 @@
-using NUnit.Framework;
-using System;
-
-#if KeePassLib
-using KeePassLib.Keys;
-#else
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using ModernKeePassLib.Keys;
-#endif
+using ModernKeePassLib.Utility;
 
-namespace ModernKeePassLib.Test.Shared.Keys
+namespace ModernKeePassLib.Test.Keys
 {
-  [TestFixture ()]
+    [TestClass()]
     public class KcpCustomKeyTests
     {
-    static readonly byte[] testData = {
+        static readonly byte[] testData =
+        {
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
 
-    [Test ()]
-    public void TestConstruct ()
+        [TestMethod]
+        public void TestConstruct()
+        {
+            var expectedHash = new byte[32]
             {
-      var expectedHash = new byte[32] {
                 0xAF, 0x55, 0x70, 0xF5, 0xA1, 0x81, 0x0B, 0x7A,
                 0xF7, 0x8C, 0xAF, 0x4B, 0xC7, 0x0A, 0x66, 0x0F,
                 0x0D, 0xF5, 0x1E, 0x42, 0xBA, 0xF9, 0x1D, 0x4D,
                 0xE5, 0xB2, 0x32, 0x8D, 0xE0, 0xE8, 0x3D, 0xFC
             };
 
-      var key = new KcpCustomKey ("test1", testData, false);
-      var keyData = key.KeyData.ReadData ();
-      Assert.That (keyData, Is.EqualTo (testData));
+            var key = new KcpCustomKey("test1", testData, false);
+            var keyData = key.KeyData.ReadData();
+            Assert.IsTrue(MemUtil.ArraysEqual(keyData, testData));
 
-      key = new KcpCustomKey ("test2", testData, true);
-      keyData = key.KeyData.ReadData ();
-      Assert.That (keyData, Is.EqualTo (expectedHash));
+            key = new KcpCustomKey("test2", testData, true);
+            keyData = key.KeyData.ReadData();
+            Assert.IsTrue(MemUtil.ArraysEqual(keyData, expectedHash));
         }
     }
 }
-

ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs

@@ -1,22 +1,19 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.IO;
-
-#if KeePassLib
-using KeePassLib.Keys;
-#else
+using Windows.Storage;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using ModernKeePassLib.Keys;
-#endif
+using ModernKeePassLib.Utility;
 
-namespace ModernKeePassLib.Test.Shared.Keys
+namespace ModernKeePassLib.Test.Keys
 {
-  [TestFixture ()]
+    [TestClass]
     public class KcpKeyFileTests
     {
-    const string testCreateFile = "TestCreate.xml";
-    const string testKey = "0123456789";
+        private const string TestCreateFile = "TestCreate.xml";
+        private const string TestKey = "0123456789";
 
-    const string expectedFileStart =
+        private const string ExpectedFileStart =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
             "<KeyFile>\r\n" +
             "\t<Meta>\r\n" +
@@ -25,50 +22,61 @@ namespace ModernKeePassLib.Test.Shared.Keys
             "\t<Key>\r\n" +
             "\t\t<Data>";
 
-    const string expectedFileEnd = "\t</Key>\r\n" +
+        private const string ExpectedFileEnd = "\t</Key>\r\n" +
                                        "</KeyFile>\r\n";
 
-    [Test ()]
-    public void TestConstruct ()
+        [TestMethod]
+        public void TestConstruct()
+        {
+            var expectedKeyData = new byte[32]
             {
-      var expectedKeyData = new byte[32] {
                 0xC1, 0xB1, 0x12, 0x77, 0x23, 0xB8, 0x99, 0xB8,
                 0xB9, 0x3B, 0x1B, 0xFF, 0x6C, 0xBE, 0xA1, 0x5B,
                 0x8B, 0x99, 0xAC, 0xBD, 0x99, 0x51, 0x85, 0x95,
                 0x31, 0xAA, 0x14, 0x3D, 0x95, 0xBF, 0x63, 0xFF
             };
 
-      var fullPath = Path.Combine(Path.GetTempPath(), testCreateFile);
-      using (var fs = new FileStream(fullPath, FileMode.Create)) {
-        using (var sw = new StreamWriter(fs)) {
-          sw.Write (expectedFileStart);
-          sw.Write (testKey);
-          sw.Write (expectedFileEnd);
-        }
-      }
-
-      try {
-        var keyFile = new KcpKeyFile (fullPath);
-        var keyData = keyFile.KeyData.ReadData ();
-        Assert.That (keyData, Is.EqualTo (expectedKeyData));
-      } finally {
-        File.Delete (fullPath);
-      }
-    }
-
-    [Test ()]
-    public void TestCreate ()
+            var fullPath = Path.Combine(ApplicationData.Current.TemporaryFolder.Path, TestCreateFile);
+            var file = ApplicationData.Current.TemporaryFolder.CreateFileAsync(TestCreateFile).GetAwaiter().GetResult();
+            using (var fs = file.OpenStreamForWriteAsync().GetAwaiter().GetResult())
             {
-      var fullPath = Path.Combine(Path.GetTempPath(), testCreateFile);
-      File.Create(fullPath).Close();
-      KcpKeyFile.Create (fullPath, null);
-      try {
-        var fileContents = File.ReadAllText (fullPath);
-        Assert.That (fileContents.Length, Is.EqualTo (187));
-        Assert.That (fileContents, Does.StartWith (expectedFileStart));
-        Assert.That (fileContents, Does.EndWith (expectedFileEnd));
-      } finally {
-        File.Delete (fullPath);
+                using (var sw = new StreamWriter(fs))
+                {
+                    sw.Write(ExpectedFileStart);
+                    sw.Write(TestKey);
+                    sw.Write(ExpectedFileEnd);
+                }
+            }
+
+            try
+            {
+                var keyFile = new KcpKeyFile(fullPath);
+                var keyData = keyFile.KeyData.ReadData();
+                Assert.IsTrue(MemUtil.ArraysEqual(keyData, expectedKeyData));
+            }
+            finally
+            {
+                file.DeleteAsync().GetAwaiter().GetResult();
+            }
+        }
+
+        [TestMethod]
+        public void TestCreate()
+        {
+            var fullPath = Path.Combine(ApplicationData.Current.TemporaryFolder.Path, TestCreateFile);
+            var file = ApplicationData.Current.TemporaryFolder.CreateFileAsync(TestCreateFile).GetAwaiter().GetResult();
+            KcpKeyFile.Create(fullPath, null);
+            try
+            {
+                var fileContents = FileIO.ReadTextAsync(file).GetAwaiter().GetResult();
+
+                Assert.AreEqual(fileContents.Length, 187);
+                Assert.IsTrue(fileContents.StartsWith(ExpectedFileStart));
+                Assert.IsTrue(fileContents.EndsWith(ExpectedFileEnd));
+            }
+            finally
+            {
+                file.DeleteAsync().GetAwaiter().GetResult();
             }
         }
     }