diff --git a/portmaster/index.html b/portmaster/index.html
index 9be5667..e457b58 100644
--- a/portmaster/index.html
+++ b/portmaster/index.html
@@ -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.spn %}
+            <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>