diff --git a/services.json b/services.json
index 3c823d6..7bae37e 100644
--- a/services.json
+++ b/services.json
@@ -31,15 +31,15 @@
             "exclude_from_simple": false
         },
         {
-            "name": "Invidious",
-            "url": "https://invidious.private.coffee",
+            "name": "Piped",
+            "url": "https://piped.private.coffee",
             "short_description": "Watch YouTube videos without Google tracking.",
-            "long_description": "Invidious is an alternative front-end to YouTube. It allows you to watch YouTube videos without Google tracking you.",
+            "long_description": "Piped is another alternative front-end to YouTube. It allows you to watch YouTube videos without Google tracking you.",
             "status": "OK",
             "links": [
                 {
-                    "name": "Go to Invidious",
-                    "url": "https://invidious.private.coffee"
+                    "name": "Go to Piped",
+                    "url": "https://piped.private.coffee"
                 }
             ],
             "exclude_from_index": false,
@@ -61,15 +61,15 @@
             "exclude_from_simple": false
         },
         {
-            "name": "Piped",
-            "url": "https://piped.private.coffee",
+            "name": "Invidious",
+            "url": "https://invidious.private.coffee",
             "short_description": "Watch YouTube videos without Google tracking.",
-            "long_description": "Piped is another alternative front-end to YouTube. It allows you to watch YouTube videos without Google tracking you.",
-            "status": "OK",
+            "long_description": "Invidious is an alternative front-end to YouTube. It allows you to watch YouTube videos without Google tracking you.",
+            "status": "NOK",
             "links": [
                 {
-                    "name": "Go to Piped",
-                    "url": "https://piped.private.coffee"
+                    "name": "Go to Invidious",
+                    "url": "https://invidious.private.coffee"
                 }
             ],
             "exclude_from_index": false,
diff --git a/templates/base.html b/templates/base.html
index dfe1cec..4a1f2d8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -20,7 +20,7 @@
   <nav class="navbar navbar-expand-sm navbar-dark" style="background-color: #ffb6c1;"> 
     <div class="container">
       <div class="row align-items-center w-100">
-        <div class="col-sm-9">
+        <div class="col-sm-8">
           <a class="navbar-brand text-mauve" href="/">
             <img class="navbar-brand-img" src="assets/img/logo-inv_grad.svg" alt="Private.coffee logo">
             <h1 style="display: inline; font-family: 'title-font', sans-serif;">Private.coffee</h1> 
@@ -29,8 +29,8 @@
         <div class="col-sm-2 d-flex justify-content-center text-mauve index-buttons"> 
           <a href="membership.html" class="btn btn-primary">♥ Support Us ♥</a>
         </div>
-        <div class="col-sm-1 d-flex justify-content-center index-buttons"> 
-          <a href="https://status.private.coffee" class="btn btn-primary big">Status</a>
+        <div class="col-sm-2 d-flex justify-content-center index-buttons"> 
+          <a href="https://status.private.coffee" class="btn btn-primary big">Status Monitor</a>
         </div>
       </div>
     </div>
diff --git a/templates/index.html b/templates/index.html
index c411bf7..9e334aa 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,7 +3,7 @@
 <div class="container text-mauve">
   <h1>Welcome to Private.coffee</h1>
   <p>
-    Private.coffee is a collection of services that respect your privacy.
+    Private.coffee provides a collection of services that respect your privacy.
   </p>
   <p>
     Click on a service to go to it. Some services are also available using
diff --git a/templates/membership.html b/templates/membership.html
index 5ff12e1..8998249 100644
--- a/templates/membership.html
+++ b/templates/membership.html
@@ -1,23 +1,54 @@
-{% extends "base.html" %}
-{% block content %}
+{% extends "base.html" %} {% block content %}
 <div class="container text-mauve">
   <h1>Membership/Donations</h1>
-  <p>private.coffee is a non-profit organization dedicated to supporting privacy and digital sovereignty. We fund our server infrastructure through donations and membership fees.</p>
-    <p>Membership fees help cover the costs of server infrastructure, domain names, and other operating expenses. Likewise, all donations contribute towards these ongoing costs.</p>
-    <p>Supporting the private.coffee project is possible by joining our association or by making a direct donation.</p>
+  <p>
+    private.coffee is a non-profit organization dedicated to supporting privacy
+    and digital sovereignty. We fund our server infrastructure through donations
+    and membership fees.
+  </p>
+  <p>
+    Membership fees help cover the costs of server infrastructure, domain names,
+    and other operating expenses. Likewise, all donations contribute towards
+    these ongoing costs.
+  </p>
+  <p>
+    Supporting the private.coffee project is possible by joining our association
+    or by making a direct donation.
+  </p>
   <div class="donation-details">
     <p><b>Donations:</b></p>
-    <p>Bank private.coffee - Verein zur Förderung von Privatsphäre und digitaler Souveränität</p>
+    <p>
+      Bank private.coffee - Verein zur Förderung von Privatsphäre und digitaler
+      Souveränität
+    </p>
     <p>IBAN: AT35 2081 5000 4554 0812</p>
     <p>BIC: STSPAT2GXXX</p>
-    <p>For donation listing preferences, please specify in the note to payee.</p>
+    <p>
+      For donation listing preferences, please specify in the note to payee.
+    </p>
   </div>
 
-  <p class="zvr-number">Central Register of Associations (ZVR) Number: 1758485319</p>
-
-  <p class="contact-info">
-    Interested in joining the association? Reach out via email:
-    <a href="mailto:support@private.coffee">support@private.coffee</a>
-  </p>
+  <div class="zvr-number">
+    <p>Central Register of Associations (ZVR) Number: 1758485319</p>
+    <p>
+      Our statutes can be found in our Git
+      <a href="https://git.private.coffee/PrivateCoffee/statuten"
+        >in German (legally binding)</a
+      >
+      and
+      <a
+        href="https://git.private.coffee/PrivateCoffee/Statuten/src/branch/english"
+        >in English</a
+      >.
+    </p>
+    <p class="contact-info">
+      Interested in joining the association? Reach out via
+      <a href="mailto:support@private.coffee">email</a> or
+      <a href="https://matrix.private.cf/#/#private.coffee:private.coffee"
+        >Matrix</a
+      >
+      for more information.
+    </p>
+  </div>
 </div>
 {% endblock %}
diff --git a/templates/privacy.html b/templates/privacy.html
index 7ba21d5..621fdbf 100644
--- a/templates/privacy.html
+++ b/templates/privacy.html
@@ -6,7 +6,7 @@
     we collect and use your personal data.
   </p>
   <p>
-    This privacy policy is effective as of 2023-03-10. It may be updated from
+    This privacy policy is effective as of 2024-04-26. It may be updated from
     time to time, so please check back regularly.
   </p>
   <p>
@@ -32,7 +32,8 @@
   <p>We collect the following data from you:</p>
   <ul>
     <li>
-      Your IP address, which is automatically collected by our web server.
+      Your IP address, which is automatically collected by our web server for
+      some of our services.
     </li>
     <li>
       Any data you provide to us, such as your email address, when you create an
@@ -43,6 +44,10 @@
       time you last logged in, or the number of times you have logged in, as
       well as any content you create using our services.
     </li>
+    <li>
+      Any information, including personal data and payment information, that you
+      provide to us when you make a donation or join our association.
+    </li>
   </ul>
   <h2>How do we use your data?</h2>
   <p>
@@ -51,12 +56,24 @@
   </p>
   <ul>
     <li>Communication between our web server and your browser</li>
+    <li>Storing your preferences or your created content</li>
     <li>Detection of abuse or resource exhaustion on our servers</li>
+    <li>Providing support to you</li>
+    <li>Processing donations and memberships</li>
   </ul>
+  <p>All of those are what is called "legitimate interests" in legal speak.</p>
+  <p>
+    We do not use your data for any other purposes, including marketing,
+    advertising, or tracking, we do not share your data with third parties
+    (unless required by law), we do not use your data to create profiles or make
+    automated decisions, and we do not cross-reference your data between
+    different services or any other sources.
+  </p>
   <h2>Where do we store your data?</h2>
   <p>
-    We store your data on our web servers, which are located in Austria and
-    Germany, so within the European Union.
+    We store your data on our web servers, which are located in Austria. We also
+    use servers in Germany, but those are not public-facing and do not store or
+    process any personal data.
   </p>
   <h2>How long do we store your data?</h2>
   <ul>
@@ -76,6 +93,18 @@
       any other data you provide to us for up to 30 days in our support system.
       After that, the data will be deleted automatically.
     </li>
+    <li>
+      Data associated with a donation is stored for as long as required by law,
+      which is currently 7 years in Austria. After that, the data will be
+      deleted.
+    </li>
+    <li>
+      Data associated with a membership is stored for as long as you are a
+      member of our association. If you leave the association, your data will be
+      deleted automatically. This does not apply to data that is required by law
+      to be stored for a longer period of time, such as financial records, which
+      are stored for 7 years regardless of your membership status.
+    </li>
   </ul>
   <h2>What are your data protection rights?</h2>
   <p>You have the following data protection rights:</p>
@@ -123,13 +152,14 @@
     you between multiple visits.
   </p>
   <p>
-    Cookies are used on this website to provide you with a better experience.
-    For example, we use cookies to remember your preferences and settings - for
-    example, to allow you to login to our services - and to provide you with a
-    better experience when browsing our services. We do not use cookies to track
-    your activity, either on our services or on other websites. In
-    legal/technical terms, we exclusively use "strictly necessary" first-party
-    cookies, which is also why you don't see any cookie banners on our website.
+    Cookies are used on some of our services to provide you with a better
+    experience. For example, we use cookies to remember your preferences and
+    settings - for example, to allow you to login to our services - and to
+    provide you with a better experience when browsing our services. We do not
+    use cookies to track your activity, either on our services or on other
+    websites. In legal/technical terms, we exclusively use "strictly necessary"
+    first-party cookies, which is also why you don't see any cookie banners on
+    our website.
   </p>
 </div>
 {% endblock %}
diff --git a/templates/terms.html b/templates/terms.html
index c2b917b..6f5f170 100644
--- a/templates/terms.html
+++ b/templates/terms.html
@@ -50,7 +50,9 @@
     you are found to be harassing, bullying, or abusing other users, spreading
     hate, lies or misinformation, we will terminate your account and delete your
     data. Note that we may and will report you to the appropriate authorities if
-    we find your actions to be illegal.
+    we find your actions to be illegal. If you find yourself on the receiving
+    end of harassment, bullying, or abuse, please report it to us as soon as
+    possible.
   </p>
   <p>
     c. You are responsible for your own actions and any content you post on our