diff --git a/_includes/footer.html b/_includes/footer.html
index c920fa0..54b757d 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -30,9 +30,6 @@
           <li class="block mr-0">
             <a href="{{ site.about_url }}" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">About Us</a>
           </li>
-          <li class="mt-3 block mr-0">
-            <a href="{{ site.business_model_url }}" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Business Model</a>
-          </li>
           <li class="mt-3 block mr-0">
             <a href="{{ site.ownership_url }}" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Ownership</a>
           </li>
@@ -84,10 +81,10 @@
       <div class="flex">
         <ul class="list-reset mb-6">
           <li class="block mr-0">
-            <a href="{{ site.portmaster_url }}#download" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Download</a>
+            <a href="{{ site.portmaster_url }}" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Discover</a>
           </li>
           <li class="mt-3 block mr-0">
-            <a href="{{ site.docs_url }}#portmaster" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Docs</a>
+            <a href="{{ site.docs_url }}portmaster/architecture/overview/" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Documentation</a>
           </li>
           <li class="mt-3 block mr-0">
             <a href="{{ site.github_url }}/portmaster/" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Source Code</a>
@@ -118,7 +115,7 @@
       <div class="flex">
         <ul class="list-reset mb-6">
           <li class="block mr-0">
-            <a href="{{ site.account_server_url }}pricing/" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Pricing</a>
+            <a href="{{ site.spn_url }}" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Discover</a>
           </li>
           <li class="mt-3 block mr-0">
             <a href="{{ site.whitepaper_url }}" class="no-underline hover:opacity-100 opacity-55 text-white transition duration-150 ease-in-out">Whitepaper</a>
@@ -144,7 +141,7 @@
   <div class="text-sm pt-20 pb-4">
     <div class="lg:flex md:mx-auto" style="width: max-content;">
       <p class="md:text-center leading-6 text-white opacity-25">
-        &copy; 2020 Safing ICS Technologies GmbH
+        &copy; {{ site.time | date: '%Y' }} Safing ICS Technologies GmbH
       </p>
       <ul class=" pt-5 lg:pt-0 md:flex">
         <li class="lg:pl-16">
diff --git a/_includes/header.html b/_includes/header.html
index 3a5ecbc..02fbb7c 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -25,7 +25,7 @@
               not even freedom of thought. 
             </p>
             <div class="pb-0 pt-10 md:py-10 lg:flex text-center">
-              <a href="#features">
+              <a href="{{ site.portmaster_url }}">
                 <button type="button" class="bg-black mb-5 md:mb-0 transform hover:scale-95 inline-flex items-center px-5 px-10 py-3 border border-transparent text-xs leading-5 font-extrabold rounded-full text-white focus:outline-none focus:border-indigo-700 active:bg-indigo-700 transition duration-150 ease-in-out uppercase">
                   Take back your freedom
                 </button>
diff --git a/about/index.html b/about/index.html
index 2ce38b3..aa83442 100644
--- a/about/index.html
+++ b/about/index.html
@@ -40,27 +40,66 @@ redirect_from:
       </div>
     </div>
   </div>
-  <div class="items-center h-full my-40 md:my-64">
-    <div class="container mx-auto px-8 sm:px-0 flex">
-      <div class="flex grid md:grid-cols-2">
-        <div class="mx-auto transform hover:scale-95 duration-150 ease-in-out">
-          <div class="absolute bg-white w-48 text-center mx-auto leading-tight p-3">
-            <span class="text-2xl font-extrabold">Get to know some of us.</span>
+  <div class="items-center h-full my-48">
+    <div class="flex items-center h-full">
+      <div class="container mx-auto px-8 sm:px-0 flex">
+        <div class="max-w-screen-xl mx-auto px-4 sm:px-6 lg:px-0 lg:flex">
+          <div class="max-w-screen-xl mx-auto px-4 sm:px-6 lg:px-0">
+            <div class="inline-block max-w-3xl text-center md:text-left">
+              <h2 class="text-5xl w-1/1 tracking-tight font-extrabold leading-none py-10">Engage the problem at <span style="color: #6188ff;">The Core</span></h2>
+              <p class="text-md opacity-55">
+                The Internet is one of the most beautiful things there is. But every connection has the potential to betray you, leaking personal information you never wanted to share. That's where we intercept.
+              </p>
+            </div>
           </div>
-          <video src="{{ site.assets_server_url }}video/interview_sessions/1/daniel.mp4" controls></video>
-        </div>
-        <div class="mx-auto grid md:grid-cols-2 gap-8 lg:pl-8 lg:pt-0 transform scale-90">
-          <div class="mx-auto transform hover:scale-95 duration-150 ease-in-out">
-            <video src="{{ site.assets_server_url }}video/interview_sessions/1/david.mp4" controls></video>
-          </div>
-          <div class="mx-auto transform hover:scale-95 duration-150 ease-in-out">
-            <video src="{{ site.assets_server_url }}video/interview_sessions/1/tabitha.mp4" controls></video>
-          </div>
-          <div class="mx-auto transform hover:scale-95 duration-150 ease-in-out">
-            <video src="{{ site.assets_server_url }}video/interview_sessions/1/raphael.mp4" controls></video>
-          </div>
-          <div class="mx-auto transform hover:scale-95 duration-150 ease-in-out">
-            <video src="{{ site.assets_server_url }}video/interview_sessions/1/martin.mp4" controls></video>
+          <div class="mt-10 self-center md:ml-0 lg:ml-16">
+            <ul class="md:grid md:grid-cols-3 md:col-gap-10 md:row-gap-10 text-center md:text-left">
+              <li class="pt-8 md:pt-0 transform transition hover:scale-105 duration-150 ease-in-out">
+                <div class="flex items-center justify-center pl-2 md:pl-0 h-12 md:w-12 w-auto">
+                  <svg class="h-8 w-8" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                    <g fill="none">
+                      <path stroke="#446eed" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" d="M20 11.182c0 4.541-3.413 8.787-8 9.818-4.587-1.031-8-5.277-8-9.818V7.615c0-.812.491-1.544 1.243-1.851l5-2.046c1.126-.461 2.388-.461 3.514 0l5 2.046C19.509 6.072 20 6.803 20 7.615v3.567z" />
+                      <path stroke="#446eed" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" d="M15.25 10.125l-3.75 3.75-2.25-2.25" />
+                    </g>
+                  </svg>
+                </div>
+                <div class="mt-4 ml-4">
+                  <h5 class="text-2xl leading-6 font-bold text-gray-900">Open Source</h5>
+                  <p class="mt-4 text-base leading-6 opacity-55 max-w-sm m-auto">
+                    Secure software can only emerge when many smart people review and contribute to the code base.
+                  </p>
+                </div>
+              </li>
+              <li class="pt-10 md:pt-0 transform transition hover:scale-105 duration-150 ease-in-out">
+                <div class="flex items-center justify-center pl-2 md:pl-0 h-12 md:w-12 w-auto">
+                  <svg class="heart h-8 w-8" stroke="#446eed" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M12 5.711C12.689 4.905 13.881 4 15.696 4 18.871 4 21 6.98 21 9.755 21 15.556 13.778 20 12 20c-1.778 0-9-4.444-9-10.245C3 6.98 5.129 4 8.304 4c1.815 0 3.007.905 3.696 1.711z" stroke-linecap="round" stroke-width="1.8" fill="none"
+                      stroke-linejoin="round" />
+                  </svg>
+                </div>
+                <div class="mt-4 ml-4">
+                  <h5 class="text-2xl leading-6 font-bold text-gray-900">Transparency</h5>
+                  <p class="mt-4 text-base leading-6 opacity-55  max-w-sm m-auto">
+                    The trust to handle your sensitive data can only grow by being open about our company. In every aspect.
+                  </p>
+                </div>
+              </li>
+              <li class="pt-10 md:pt-0 transform transition hover:scale-105 duration-150 ease-in-out">
+                <div class="flex items-center justify-center pl-2 md:pl-0 h-12 md:w-12 w-auto ">
+                  <svg class="h-8 w-8" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                    <g stroke-linecap="round" stroke-width="1.8" stroke="#446eed" fill="none" stroke-linejoin="round">
+                      <path d="M13.7678 10.9822c.976311.976311.976311 2.55922 0 3.53553-.976311.976311-2.55922.976311-3.53553 0-.976311-.976311-.976311-2.55922 0-3.53553.976311-.976311 2.55922-.976311 3.53553 0M19.2538 4.98223c.976311.976311.976311 2.55922 0 3.53553-.976311.976311-2.55922.976311-3.53553 0-.976311-.976311-.976311-2.55922 0-3.53553.976311-.976311 2.55922-.976311 3.53553 0M18 12.25c1.533 0 3 .533 4 1.333M8.28177 4.98223c.976311.976311.976311 2.55922 0 3.53553-.976311.976311-2.55922.976311-3.53553 0-.976311-.976311-.976311-2.55922 0-3.53553.976311-.976311 2.55922-.976311 3.53553 0M2 13.583c1-.8 2.467-1.333 4-1.333M16.591 19.75c-1.165-.901-2.839-1.5-4.591-1.5-1.752 0-3.426.599-4.591 1.5" />
+                    </g>
+                  </svg>
+                </div>
+                <div class="mt-4 ml-4">
+                  <h5 class="text-2xl leading-6 font-bold text-gray-900">Our Quest</h5>
+                  <p class="mt-4 text-base leading-6 opacity-55 max-w-sm m-auto">
+                    We chase freedom so our societies can flourish. Giving control back to the people is way overdue.
+                  </p>
+                </div>
+              </li>
+            </ul>
           </div>
         </div>
       </div>
diff --git a/assets/img/page-specific/portmaster/enforce-dns-over-tls.png b/assets/img/page-specific/portmaster/enforce-dns-over-tls.png
index 13bff06..e03de3c 100644
Binary files a/assets/img/page-specific/portmaster/enforce-dns-over-tls.png and b/assets/img/page-specific/portmaster/enforce-dns-over-tls.png differ
diff --git a/index.html b/index.html
index 7338415..d82277a 100644
--- a/index.html
+++ b/index.html
@@ -6,10 +6,11 @@ title: Safing - Love Freedom
 {% include header.html %}
 
 <section id="features" class="my-32 md:mt-16 md:mb-40">
-  <div class="mx-auto lg:pl-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col" style="max-width: 2000px;">
+ 
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col" style="max-width: 2000px;">
     <div class="mx-auto lg:mr-0 lg:ml-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:mr-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
@@ -19,16 +20,24 @@ title: Safing - Love Freedom
         <p class="text-md opacity-55 max-w-lg">
           Discover everything that is happening on your computer. Expose every connection your applications make and detect evil ones. Finally get the power to act accordingly.
         </p>
+        <div class="py-10 sm:py-10 text-center sm:flex">
+          <a href="{{ site.portmaster_url }}">
+            <button type="button" style="background-color: #000;" class="transform hover:scale-95 inline-flex items-center px-10 py-3 border border-transparent text-xs leading-5 font-extrabold rounded-full text-white hover:bg-indigo-500 focus:outline-none focus:border-indigo-700 active:bg-indigo-700 transition duration-150 ease-in-out uppercase">
+              Discover the Portmaster
+            </button>
+          </a>
+        </div>
       </div>
     </div>
     <div class="lg:-mr-20 ml-auto row-start-1 self-end md:self-start ">
       <img class="" src="{{ site.img_url }}page-specific/portmaster/monitor-network-activity.png" alt="">
     </div>
   </div>
-  <div class="mx-auto lg:pr-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
+
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64 lg:pt-20" style="max-width: 1700px;">
     <div class="row-start-2 lg:row-start-1 lg:col-start-2 mx-auto lg:ml-0 lg:mr-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:ml-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
@@ -38,16 +47,24 @@ title: Safing - Love Freedom
         <p class="text-md opacity-55 max-w-lg" style="max-width: 471px;">
           Protect your whole computer, not just your browser. Block all advertisements and trackers for every application. Easily add your own rules and block individual domains.
         </p>
+        <div class="py-10 sm:py-10 text-center sm:flex">
+          <a href="{{ site.portmaster_url }}">
+            <button type="button" style="background-color: #000;" class="transform hover:scale-95 inline-flex items-center px-10 py-3 border border-transparent text-xs leading-5 font-extrabold rounded-full text-white hover:bg-indigo-500 focus:outline-none focus:border-indigo-700 active:bg-indigo-700 transition duration-150 ease-in-out uppercase">
+              Discover the Portmaster
+            </button>
+          </a>
+        </div>
       </div>
     </div>
     <div class="mx-auto md:ml-auto row-start-1 self-end md:self-center">
       <img class="" src="{{ site.img_url }}page-specific/portmaster/block-trackers-system-wide.png" alt="">
     </div>
   </div>
-  <div class="mx-auto lg:pl-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
+
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64 lg:pt-20" style="max-width: 1700px;">
     <div class="mx-auto lg:mr-0 lg:ml-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:mr-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
@@ -63,10 +80,6 @@ title: Safing - Love Freedom
               Discover the Portmaster
             </button>
           </a>
-          <br>
-          <a href="{{ site.portmaster_url }}#downloads" class="sm:pl-8 transition duration-150 ease-in-out hover:opacity-100 self-center uppercase opacity-55 text-xs font-bold">
-            Download Alpha
-          </a>
         </div>
       </div>
     </div>
diff --git a/portmaster/index.html b/portmaster/index.html
index 9be5667..df6b0cb 100644
--- a/portmaster/index.html
+++ b/portmaster/index.html
@@ -17,11 +17,11 @@ redirect_from:
     <div class="h-full mx-auto ">
       <div class="text-center">
         <h2 class="text-5xl sm:text-6xl tracking-tight font-extrabold leading-none py-10">
-          Portmaster
+          Take Back Control of Your Computer
         </h2>
         <div class="self-center">
           <p class="text-md opacity-55 max-w-lg mx-auto">
-            The privacy app that gives you back control over all your computer's network connections.
+            Portmaster is a free and open-source application that puts you back in charge over all your computer's network connections.
           </p>
           <div class="py-10 sm:py-10 block mx-auto">
             <a href="#downloads">
@@ -41,19 +41,11 @@ redirect_from:
     </div>
   </div>
 </header>
-<section id="features" class="my-32 md:mt-16 md:mb-40">
-  <div class="text-center py-24 lg:pt-0 lg:pb-48">
-    <h2 class="text-5xl tracking-tight font-extrabold leading-none py-10 mr-auto ml-auto">
-      A Bundle of Privacy Features
-    </h2>
-    <p class="text-md opacity-55 w-auto mx-auto max-w-lg">
-       At its core, the Portmaster sits on your kernel and simply intercepts all your network connections. You decide which privacy features you want to enable or disable as you desire.
-    </p>
-  </div>
-  <div class="mx-auto lg:pl-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col" style="max-width: 2000px;">
+<section id="features" class="my-32 md:pt-32 md:mb-40 ">
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col" style="max-width: 2000px;">
     <div class="mx-auto lg:mr-0 lg:ml-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:mr-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
@@ -69,10 +61,10 @@ redirect_from:
       <img class="" src="{{ site.img_url }}page-specific/portmaster/monitor-network-activity.png" alt="">
     </div>
   </div>
-  <div class="mx-auto lg:pr-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
     <div class="row-start-2 lg:row-start-1 lg:col-start-2 mx-auto lg:ml-0 lg:mr-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:ml-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
@@ -80,7 +72,7 @@ redirect_from:
           Manually Allow or Block Connections
         </h2>
         <p class="text-md opacity-55 max-w-lg" style="max-width: 471px;">
-          Add your own rules to additionally block all domains you dislike. Enable Prompt Mode and decide the fate of every new connection. Block or Allow.
+          Add your own rules to block specific domains you dislike. Enable Prompt Mode and decide the fate of every new connection. Block or Allow.
         </p>
       </div>
     </div>
@@ -88,14 +80,14 @@ redirect_from:
       <img class="" src="{{ site.img_url }}page-specific/portmaster/manually-allow-ord-block-connections.png" alt="">
     </div>
   </div>
-  <div class="mx-auto lg:pl-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64  lg:pt-12" style="max-width: 1700px;">
     <div class="mx-auto lg:mr-0 lg:ml-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:mr-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
-        <h2 style="max-width: 400px; line-height: 60px;" class="text-5xl tracking-tight font-extrabold leading-none pt-8 pb-10 lg:w-auto">
+        <h2 style="max-width: 403px; line-height: 60px;" class="text-5xl tracking-tight font-extrabold leading-none pt-8 pb-10 lg:w-auto">
           Auto-Block via Selected Filter Lists
         </h2>
         <p class="text-md opacity-55 max-w-lg">
@@ -114,14 +106,14 @@ redirect_from:
       <img class="" src="{{ site.img_url }}page-specific/portmaster/block-trackers-system-wide.png" alt="">
     </div>
   </div>
-  <div class="mx-auto lg:pr-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64 lg:pt-20" style="max-width: 1700px;">
     <div class="row-start-2 lg:row-start-1 lg:col-start-2 mx-auto lg:ml-0 lg:mr-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:ml-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
-        <h2 style="max-width: 400px; line-height: 60px;" class="text-5xl tracking-tight font-extrabold leading-none pt-8 pb-10">
+        <h2 style="max-width: 384px; line-height: 60px;" class="text-5xl tracking-tight font-extrabold leading-none pt-8 pb-10">
           Enforce DNS-over-TLS
         </h2>
         <p class="text-md opacity-55 max-w-lg" style="max-width: 471px;">
@@ -133,10 +125,10 @@ redirect_from:
       <img class="" src="{{ site.img_url }}page-specific/portmaster/enforce-dns-over-tls.png" alt="">
     </div>
   </div>
-  <div class="mx-auto lg:pl-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
     <div class="mx-auto lg:mr-0 lg:ml-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:mr-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
@@ -148,14 +140,14 @@ redirect_from:
         </p>
       </div>
       <div class="py-10 sm:py-10 text-center sm:flex">
-        <a href="{{ site.portmaster_url }}">
+        <a href="{{ site.docs_url }}">
           <button type="button" style="background-color: #000;" class="transform hover:scale-95 inline-flex items-center px-10 py-3 border border-transparent text-xs leading-5 font-extrabold rounded-full text-white hover:bg-indigo-500 focus:outline-none focus:border-indigo-700 active:bg-indigo-700 transition duration-150 ease-in-out uppercase">
-            Source Code
+            Check out the Docs
           </button>
         </a>
         <br>
-        <a href="{{ site.portmaster_url }}#downloads" class="sm:pl-8 transition duration-150 ease-in-out hover:opacity-100 self-center uppercase opacity-55 text-xs font-bold">
-          Checkout our Docs
+        <a href="{{ site.github_url }}/portmaster" class="sm:pl-8 transition duration-150 ease-in-out hover:opacity-100 self-center uppercase opacity-55 text-xs font-bold">
+          Inspect Source Code
         </a>
       </div>
     </div>
@@ -163,10 +155,10 @@ redirect_from:
       <img class="" src="{{ site.img_url }}page-specific/portmaster/explore-the-docs-and-source-code.png" alt="">
     </div>
   </div>
-  <div class="mx-auto lg:pr-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
     <div class="row-start-2 lg:row-start-1 lg:col-start-2 mx-auto lg:ml-0 lg:mr-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:ml-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
@@ -182,10 +174,10 @@ redirect_from:
       <img class="" src="{{ site.img_url }}page-specific/portmaster/configure-settings-for-different-networks.png" alt="">
     </div>
   </div>
-  <div class="mx-auto lg:pl-16 grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64" style="max-width: 1700px;">
+  <div class="mx-auto grid grid-rows-auto grid-cols-1 grid-row-col lg:grid-cols-2 lg:grid-flow-col mt-32 lg:mt-64 lg:pt-20" style="max-width: 1700px;">
     <div class="mx-auto lg:mr-0 lg:ml-auto mt-16 md:my-auto px-4 md:px-0">
       <div class="inline-block max-w-lg lg:mr-32">
-        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content;">
+        <div class="pt-1 pb-1 pr-4 pl-2 rounded-full text-white text-xs flex break-words" style="background-color: #5c85ff; width: fit-content; width: -moz-fit-content;">
           <img src="{{ site.img_url }}icons/info.svg" class="h-4 w-4 self-center mr-2">
           Alpha Software: Portmaster is in active development
         </div>
@@ -202,7 +194,7 @@ redirect_from:
     </div>
   </div>
 </section>
-<section class="mt-16 lg:mt-48 pb-20 lg:pb-40">
+<section class="mt-16 lg:mt-48">
   <div class="items-center h-full">
     <div class="">
       <div class="max-w-full mx-auto px-4 sm:px-6">
@@ -259,7 +251,8 @@ redirect_from:
                   </button>
                 </a>
               </div>
-              <div class="support" class="max-w-screen-lg mx-auto" style="margin-bottom: 6rem; margin-top: 6rem;">
+
+              <!-- <div class="support" class="max-w-screen-lg mx-auto" style="margin-bottom: 6rem; margin-top: 6rem;">
                 <h2 class="line text-md opacity-55 text-xl"><span>Support</span></h2>
                 <p style="color: #727272;" class="pt-12 max-w-lg mx-auto text-center font-medium">
                   Please report technical issues on the <a class="link" href="{{ site.github_url }}/portmaster/issues">portmaster</a>
@@ -300,7 +293,8 @@ redirect_from:
                     </button>
                   </a>
                 </div>
-              </div>
+              </div> -->
+
             </div>
           </div>
         </div>
@@ -308,3 +302,48 @@ redirect_from:
     </div>
   </div>
 </section>
+<section class="mb-16 lg:pb-32" id="faq">
+  <div class="bg-white">
+    <div class="max-w-screen-xl mx-auto pt-12 pb-16 sm:pt-16 sm:pb-20 px-4 sm:px-6 lg:pt-20 lg:pb-28 lg:px-8">
+      <div class="text-center pb-12">
+        <h2 class="text-5xl tracking-tight font-extrabold leading-none py-10 text-center">
+          FAQ
+        </h2>
+        <p class="text-md opacity-55">
+          You have a question? We answered some already, but you can always contact us at <a href="mailto:hello@safing.io">hello@safing.io</a>
+        </p>
+      </div>
+      <div class="mt-6 pt-10 text-center md:text-left">
+        <dl class="md:grid md:grid-cols-2 md:gap-8">
+          {% for faq in site.data.faq.portmaster %}
+            <div>
+              <h1 class="text-xl pb-4">
+                {{ faq.q }}
+              </h1>
+              <dd class="mt-2">
+                <p class="text-md opacity-55">
+                  {{ faq.a }}
+                </p>
+              </dd>
+              {% if faq.link %}
+                <p class="text-md pt-4" style="color: #727272;">
+                  <a class="link" href="{{ faq.link.url }}">
+                    {{ faq.link.text }}
+                  </a>
+                </p>
+              {% endif %}
+            </div>
+          {% endfor %}
+          <div>
+            <h1 class="text-xl pb-4">Where can I find your source code?</h1>
+            <dd class="mt-2">
+              <p class="text-md" style="color: #727272;">
+                You can find our code on <a href="{{ site.github_url }}" class="link">Github</a>. <a href="{{ site.github_url }}/portmaster/" class="link">The Portmaster</a>, the <a href="{{ site.github_url }}/portmaster-ui/" class="link">Portmaster UI</a>, the <a href="{{ site.github_url }}/spn/" class="link">SPN</a> and <a href="{{ site.github_url }}/web/" class="link">this website</a> have their respective repositories. <a href="{{ site.github_url }}/jess/" class="link">Jess</a>, the heart of the SPN, which got <a href="https://cure53.de/pentest-report_safing-jess.pdf">audited by Cure53</a>, can also be found online.
+              </p>
+            </dd>
+          </div>
+        </dl>
+      </div>
+    </div>
+  </div>
+</section>