diff --git a/assets/img/tools/bitwarden.png b/assets/img/tools/bitwarden.png
new file mode 100644
index 00000000..2eb05a71
Binary files /dev/null and b/assets/img/tools/bitwarden.png differ
diff --git a/index.html b/index.html
index bbbd5704..f7186bed 100644
--- a/index.html
+++ b/index.html
@@ -1453,61 +1453,58 @@ layout: default
         whether due to limitations in memory, time, or disk space.
     </li>
 </ul>
-<h1 id="pw" class="anchor"><a href="#pw"><i class="fas fa-link anchor-icon"></i></a> Password Manager Software</h1>
+<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>
 </div>
 <div class="row mb-2">
 
-    {% include card.html color="success"
-    title="Master Password - Cross-platform"
-    image="assets/img/tools/Master-Password.jpg"
-    url="https://masterpassword.app/"
-    footer="OS: Windows, macOS, Linux, iOS, Android, Web."
-    description="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."
-    %}
+  {% include card.html color="success"
+  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."
+  %}
 
-    {% include card.html color="primary"
-    title="KeePass / KeePassX - Local"
-    image="assets/img/tools/KeePass.png"
-    url="http://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="http://www.keepassx.org/">KeePassX (not regularly updated)</a> and <a href="https://keepassxc.org/">KeePassXC</a>.'
-    %}
+  {% include card.html color="primary"
+  title="KeePass / KeePassX - Local"
+  image="assets/img/tools/KeePass.png"
+  url="http://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="http://www.keepassx.org/">KeePassX (not regularly updated)</a> and <a href="https://keepassxc.org/">KeePassXC</a>.'
+  %}
 
-    {% include card.html color="warning"
-    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."
-    %}
+  {% include card.html color="warning"
+  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 all 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 Bitwarden cloud, you can easily host it on your own server."
+  %}
 
 </div>
 <h3>Worth Mentioning</h3>
 <ul>
-    <li>
-        <a href="password.html	">Secure Password Generator</a> - generates a unique set of custom, high quality, cryptographic-strength password strings which are safe for you to use.
-    </li>
+  <li>
+    <a href="password.html">Secure Password Generator</a> - generates a unique set of custom, high quality, cryptographic-strength password strings which are safe for you to use.
+  </li>
 
-    <li>
-        <a href="http://www.supergenpass.com/">SuperGenPass</a> - A master password and the domain name of the Web site you are visiting is used as the “seed” for a one-way hash algorithm (base-64 MD5). The output of this algorithm is your generated password.
-        You remember one password (your “master password”), and SGP uses it to generate unique, complex passwords for the Web sites you visit. Your generated passwords are never stored or transmitted, so you can use SGP on as many computers as you like without
-        having to “sync” anything.
-    </li>
+  <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.
+  </li>
 
-    <li>
-        <a href="http://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>
+  <li>
+    <a href="http://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>
 
 <h3>Related Information</h3>
 <ul>
-    <li><a href="https://www.youtube.com/watch?v=yzGzB-yYKcc">Edward Snowden on Passwords - YouTube</a></li>
+  <li><a href="https://www.youtube.com/watch?v=yzGzB-yYKcc">Edward Snowden on Passwords - YouTube</a></li>
 </ul>
 
 <h1 id="calendar_contacts" class="anchor"><a href="#calendar_contacts"><i class="fas fa-link anchor-icon"></i></a> Calendar and Contacts Sync</h1>