_includes/sections/password-managers.html

@@ -1,52 +1,68 @@
 <h1 id="pw" class="anchor"><a href="#pw"><i class="fas fa-link anchor-icon"></i></a> Password Manager Software</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform or iCloud Keychain, you should pick an alternative here.</strong>
+  <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform, or iCloud Keychain, you should pick an alternative here.</strong>
 </div>
 
-<div class="row mb-2">
-
-  {% include card.html color="success"
+{%
+  include cardv2.html
   title="Bitwarden - Cloud/Self-host"
   image="/assets/img/tools/bitwarden.png"
-  url="https://bitwarden.com/"
-  footer="OS: Windows, macOS, Linux, iOS, Android, Web."
-  description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
-  %}
+  description="<strong>Bitwarden</strong> is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
+  website="https://bitwarden.com/"
+  forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
+  github="https://github.com/bitwarden"
+  web="https://vault.bitwarden.com/#/"
+  linux="https://vault.bitwarden.com/download/?app=desktop&platform=linux"
+  mac="https://vault.bitwarden.com/download/?app=desktop&platform=macos"
+  firefox="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/"
+  chrome="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb"
+  safari="https://safari-extensions.apple.com/details/?id=com.bitwarden.safari-LTZ2PFU5D6"
+  opera="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/"
+  edge="https://www.microsoft.com/store/apps/9P6KXL0SVNNL"
+  android="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
+  ios="https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8"
+%}
 
-  {% include card.html color="primary"
-  title="KeePass / KeePassXC - Local"
-  image="/assets/img/tools/KeePass.png"
-  url="https://keepass.info/download.html"
-  website="keepass.info"
-  footer="OS: Windows, macOS, Linux, iOS, Android, BSD."
-  description='KeePass is a free open source password manager, which helps you to manage your passwords in a secure way. All passwords in one database, which is locked with one
-  master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: <a href="https://keepassxc.org/">KeePassXC</a> with official native cross-platform support for Windows/macOS/Linux.'
-  %}
-  {% include card.html color="warning"
+{%
+  include cardv2.html
+  title="KeePassXC - Local"
+  image="/assets/img/tools/keepassxc.png"
+  description="<strong>KeePassXC</strong> is a community fork of KeePassX, a native cross-platform port of KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager."
+  website="https://keepassxc.org/"
+  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
+  github="https://github.com/keepassxreboot/keepassxc"
+  web="https://keepassxc.org/"
+  linux="https://keepassxc.org/download/#linux"
+  mac="https://keepassxc.org/download/#mac"
+%}
+
+{%
+  include cardv2.html
   title="LessPass - Browser"
   image="/assets/img/tools/LessPass.png"
-  url="https://lesspass.com/"
-  footer="OS: Windows, macOS, Linux, Android."
-  description="LessPass is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
-  %}
-
-</div>
+  description="<strong>LessPass</strong> is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
+  website="https://lesspass.com/"
+  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
+  github="https://github.com/keepassxreboot/keepassxc"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/"
+  chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih"
+  android="https://play.google.com/store/apps/details?id=com.lesspass.android&hl=en"
+%}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li>
-    <a href="https://masterpassword.app">Master Password</a> - Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site and your master password. No syncing, backups or internet access needed.
+    <a href="https://masterpassword.app">Master Password</a> - Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site, and your master password. No syncing, backups, or internet access needed.
   </li>
 
   <li>
-    <a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails... All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
+    <a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails. All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
   </li>
 
   <li>
-    <a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember
-    a single "Master Password" of your choice in order to unlock and access your entire username/password list.
+    <a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire username/password list.
   </li>
 </ul>
 

source_code.md

@@ -187,19 +187,20 @@ Backend: closed-source
     git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
 
 ## Password Manager Software
- Bitwarden: https://github.com/bitwarden
 
- KeePass: https://keepass.info/download.html
+Bitwarden: https://github.com/bitwarden
 
- KeePassXC: https://github.com/keepassxreboot
+KeePassXC: https://github.com/keepassxreboot
 
- LessPass: https://github.com/lesspass/lesspass
+LessPass: https://github.com/lesspass/lesspass
 
-   Worth Mentioning
-.
-    Master Password: https://gitlab.com/lhunath/MasterPassword
-.
-    Password Safe: hhttps://sourceforge.net/p/passwordsafe/git-code/ci/master/tree/
+Worth Mentioning
+
+- Master Password: https://gitlab.com/lhunath/MasterPassword
+
+- Psono: https://github.com/psono
+
+- Password Safe: https://sourceforge.net/projects/passwordsafe/files/
 
 ## Calendar and Contacts Sync
   Nextcloud: https://github.com/nextcloud