diff --git a/.gitignore b/.gitignore
index e6cb179f..bb836e13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ font/assets/
 font/_sass/
 font/.fontcustom-manifest.json
 assets/webfonts/ptio-font-preview.html
+vendor
+.bundle
diff --git a/_includes/head.html b/_includes/head.html
index c072a19d..8595b009 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -22,7 +22,7 @@
   <meta property="og:locale" content="en_GB" />
   <meta property="og:site_name" content="{{ site.name }}" />
 
-  {% if page.url == "/" or page.url == "/about/" %}
+  {% if page.url == "/" %}
   <script type="application/ld+json">
   {
     "@context": "https://schema.org",
diff --git a/_includes/team.html b/_includes/team.html
index 8126a333..ad387ede 100644
--- a/_includes/team.html
+++ b/_includes/team.html
@@ -1,6 +1,6 @@
-<div class="col-12 col-sm-6 col-lg-4 col-xl-3">
-  <div class="card mb-3 mx-4 mx-sm-0" itemscope itemtype="http://schema.org/Person">
-    <img src="{{ site.baseurl }}/assets/img/png/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">
+<div class="col-12 col-sm-6 col-lg-4 {% unless include.emeritus %}col-xl-3{% endunless %}">
+  <div class="card mb-3 mx-4 mx-sm-0" itemprop="member" itemscope itemtype="http://schema.org/Person">
+    {% if include.avatar %}<img src="{{ site.baseurl }}/assets/img/{{ include.avatar | split: "." | last }}/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">{% endif %}
     <div class="card-body">
 
       <h5 class="card-title mt-0" itemprop="name">
@@ -11,9 +11,8 @@
         {{ include.name }}</h5>
       {% endif %}
 
-      <meta itemprop="affiliation" content="PrivacyTools" />
-      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{{ include.role | default: "Contributor" }}</h6>
-      <p class="card-text" {% if include.bio %}itemprop="description"{% endif %}>{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>
+      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{% if include.role %}{{ include.role }}{% elsif include.emeritus %}Former Contributor{% else %}Contributor{% endif %}</h6>
+      {% if include.bio %}<p class="card-text" itemprop="description">{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>{% endif %}
       <div class="mx-n2">
         {% if include.email %}
         <a href="{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
diff --git a/assets/img/png/team/dawid.png b/assets/img/png/team/dawid.png
deleted file mode 100644
index 8b6ceae3..00000000
Binary files a/assets/img/png/team/dawid.png and /dev/null differ
diff --git a/assets/img/png/team/mikaela.png b/assets/img/png/team/mikaela.png
deleted file mode 100644
index 1b510bc4..00000000
Binary files a/assets/img/png/team/mikaela.png and /dev/null differ
diff --git a/assets/img/svg/team/dawid.svg b/assets/img/svg/team/dawid.svg
new file mode 100644
index 00000000..2c072eb4
--- /dev/null
+++ b/assets/img/svg/team/dawid.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.87897 0 0 .87897 -5.196 483.74)"><rect transform="scale(-1,1)" x="-588.41144" y="-550.34869" width="582.5" height="582.5" ry="0" fill="#966bab" stroke-width="15.61100006"/><g transform="matrix(9.8600256,0,0,9.8681904,1.607183,-428.03719)"><g fill="#fff" stroke-width=".99958003"><path d="m21.975 29.955c-2.58 0-5.631 2.4639-6.586 3.4111-0.571 0.57152-1.433 0.74237-2.179 0.43264-0.748-0.30874-1.235-1.0371-1.235-1.8454 0-3.4561 1.672-9.9916 8-9.9916 0.757 0 1.45 0.42764 1.789 1.1051l2 3.9966c0.31 0.61948 0.277 1.3549-0.088 1.9444-0.364 0.5885-1.008 0.9472-1.701 0.9472zm24.766 3.8438c-0.75 0.31074-1.607 0.13888-2.18-0.43364-0.886-0.88425-3.997-3.4101-6.586-3.4101-0.693 0-1.337-0.3587-1.701-0.9482-0.364-0.5885-0.397-1.3249-0.088-1.9444l2-3.9966c0.339-0.67643 1.031-1.1041 1.789-1.1041 6.328 0 8 6.5355 8 9.9916 0 0.80832-0.487 1.5367-1.234 1.8454z"/><path d="m29.975-2.0185c-9.941 0-18 8.0522-18 17.985 0 9.9327 8.059 17.985 18 17.985s18-8.0522 18-17.985c0-9.9327-8.059-17.985-18-17.985zm0 6.9942c6.212 0 9.3 5.0248 9.429 5.2386 0.123 0.20383 0.08296 0.46754-0.09405 0.6274-0.178 0.15887-0.4439 0.17088-0.6349 0.029-0.038-0.02897-3.9341-2.8976-8.7001-2.8976-4.778 0-8.6611 2.8686-8.7001 2.8976-0.191 0.14188-0.4569 0.13187-0.6349-0.029-0.178-0.15986-0.21704-0.42257-0.09405-0.6274 0.128-0.21482 3.217-5.2386 9.429-5.2386zm-6.5 10.991a2.5 3.4971 0 0 1 2.5 3.4971 2.5 3.4971 0 0 1-2.5 3.4971 2.5 3.4971 0 0 1-2.5-3.4971 2.5 3.4971 0 0 1 2.5-3.4971zm13 0a2.5 3.4971 0 0 1 2.5 3.4971 2.5 3.4971 0 0 1-2.5 3.4971 2.5 3.4971 0 0 1-2.5-3.4971 2.5 3.4971 0 0 1 2.5-3.4971z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/pages/about.html b/pages/about.html
index 7dd31460..92158aa5 100644
--- a/pages/about.html
+++ b/pages/about.html
@@ -5,12 +5,16 @@ title: "About PrivacyTools"
 description: "About the PrivacyTools organization, and contributors to the PrivacyTools website, communities, and services."
 hidedesc: true
 ---
-
+<div itemscope itemtype="http://schema.org/Organization">
+<meta itemprop="alternateName" content="privacytoolsIO">
+<meta itemprop="alternateName" content="Privacy Tools">
+<meta itemprop="alternateName" content="privacytools.io">
+<link itemprop="logo" href="{{ site.production_url }}/assets/img/svg/layout/brand/square-transparent.svg">
 <div class="row">
   <div class="col">
-    <p><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
-    <p>At <strong>PrivacyTools</strong>, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. This website serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
-    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in 2015. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
+    <p itemprop="description"><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
+    <p>At <strong itemprop="name">PrivacyTools</strong>, we provide services, tools, and knowledge to protect your <span itemprop="knowsAbout">privacy</span> against <span itemprop="knowsAbout">global mass surveillance</span>, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. <a itemprop="url" href="{{ site.production_url }}">This website</a> serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
+    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in <span itemprop="foundingDate">2015</span>. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
     <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytoolsio">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytoolsio">opencollective.com/privacytoolsio</a>.</p>
     <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
   </div>
@@ -18,23 +22,11 @@ hidedesc: true
 
 <div class="row">
   <div class="col">
-    <h2>Core Contributors</h2>
+    <h2>Team Members</h2>
   </div>
 </div>
 
 <div class="row">
-
-{% include team.html
-avatar="burung.png"
-name="Burung Hantu"
-role="Founder"
-bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
-email="mailto:dude@privacytools.io"
-keys="https://keybase.io/privacytools"
-mastodon="https://social.privacytools.io/@BurungHantu"
-twitter="privacytoolsIO"
-%}
-
 {% include team.html
 avatar="jonah.png"
 name="Jonah Aragon"
@@ -48,6 +40,16 @@ twitter="JonahAragon"
 blog="jonah"
 %}
 
+{% include team.html
+avatar="burung.png"
+name="Burung Hantu"
+role="Founder"
+bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
+keys="https://keybase.io/privacytools"
+mastodon="https://social.privacytools.io/@BurungHantu"
+twitter="privacytoolsIO"
+%}
+
 {% include team.html
 avatar="blacklight447.png"
 name="Niek de Wilde"
@@ -72,7 +74,7 @@ blog="danarel"
 %}
 
 {% include team.html
-avatar="dawid.png"
+avatar="dawid.svg"
 name="Dawid Potocki"
 role="Developer"
 bio="I'm a student interested in software development. I help improve PrivacyTools and promote using free libre software."
@@ -94,15 +96,6 @@ keys="https://keybase.io/dngray"
 mastodon="https://social.privacytools.io/@dngray"
 %}
 
-{% include team.html
-avatar="mikaela.png"
-name="Mikaela Suomalainen"
-nick="Mikaela"
-bio="I am interested in instant messengers. I review privacy tools, and participate in our forum, Matrix room, and issue tracker."
-website="https://mikaela.info/"
-keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
-%}
-
 {% include team.html
 avatar="nitrohorse.png"
 name="Andreas Basurto"
@@ -123,8 +116,8 @@ bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also
 email="mailto:trai_dep@privacytools.io"
 website="https://www.reddit.com/user/trai_dep"
 %}
-
 </div>
+
 <div class="row mt-4 mb-4">
   <div class="col">
     <div class="card">
@@ -137,6 +130,22 @@ website="https://www.reddit.com/user/trai_dep"
   </div>
 </div>
 
+<div class="row">
+  <div class="col">
+    <h2>Emeritus</h2>
+    <p>Emeriti are honorary PrivacyTools team members who have formerly contributed to the project in a central way but are no longer currently active.</p>
+  </div>
+</div>
+
+<div class="row">
+{% include team.html
+name="Mikaela Suomalainen"
+website="https://mikaela.info/"
+keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
+emeritus=true
+%}
+</div>
+
 <div class="row">
   <div class="col">
     <h2>Contact Us</h2>
@@ -146,5 +155,10 @@ website="https://www.reddit.com/user/trai_dep"
     <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
     <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
     <p>Join our Matrix room at <code>#general:privacytools.io</code> or join the <a href="https://keybase.io/team/privacytools_io">privacytools_io Keybase team</a> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
+    <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
+    <link itemprop="sameAs" href="https://blog.privacytools.io">
+    <link itemprop="sameAs" href="https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg">
+    <link itemprop="sameAs" href="https://github.com/privacytoolsIO">
   </div>
 </div>
+</div>