diff --git a/capsulflask/templates/faq.html b/capsulflask/templates/faq.html
index 665475c..8e3c5dd 100644
--- a/capsulflask/templates/faq.html
+++ b/capsulflask/templates/faq.html
@@ -20,20 +20,22 @@
             <li> blog </li>
             <li> vpn </li>
             <li> bot </li>
+            <li> cgit </li>
           </ul>
         </li>
         <li>
           f1-m
           <ul>
-            <li> semi-popular blog </li>
-            <li> complicated webapp </li>
+            <li> owncloud </li>
+            <li> gitea </li>
+            <li> popular blog/vpn/bot </li>
           </ul>
         </li>
         <li>
           f1-l
           <ul>
-            <li> big ol docker box? </li>
-            <li> lightweight software builds </li>
+            <li> docker host </li>
+            <li> build system </li>
           </ul>
         </li>
         <li>
@@ -52,10 +54,10 @@
         <li>
           f1-xxx
           <ul>
-            <li> waow big box </li>
+            <li> something huge </li>
           </ul>
         </li>
-      </ul>  
+      </ul>
      </li></ul>
    </li>
    <li>
@@ -123,20 +125,20 @@ $ doas su -</pre>
    <li>
     Do you offer support?
     <ul><li>
-     <p>Yes. support@cyberia.club</p>
+     <p>Yep, email us at <a href="mailto:support@cyberia.club">support@cyberia.club</a></p>
      <ul>
        <li>all volunteers have very busy schedules, but we will do our best to respond in a reasonable time period.</li>
-       <li>If you would prefer private support, please send your mail to capsul@cyberia.club instead.</li>
+       <li>If you would prefer private support, please send your mail to <a href="mailto:capsul@cyberia.club">capsul@cyberia.club</a> instead.</li>
      </ul>
     </li></ul>
    </li>
    <li>
     Will you implement feature X?
     <ul><li>
-      Maybe! Email ops@cyberia.club and ask us about it.
+      Maybe! Email <a href="mailto:ops@cyberia.club">ops@cyberia.club</a> and ask us about it.
     </li></ul>
    </li>
- </ul>           
+ </ul>
 </p>
 
 {% endblock %}
diff --git a/capsulflask/templates/support.html b/capsulflask/templates/support.html
index 553af85..609a093 100644
--- a/capsulflask/templates/support.html
+++ b/capsulflask/templates/support.html
@@ -7,7 +7,7 @@
     <h1>SUPPORT</h1>
   </div>
   <div class="half-margin">
-    <a href="mailto:support@cyberia.club?subject=Please%20halp!">mailto:support@cyberia.club</a> 
+    <a href="mailto:support@cyberia.club?subject=Please%20halp!">support@cyberia.club</a> 
   </div>
 {% endblock %}
 
@@ -17,7 +17,7 @@
   <a href="https://lists.cyberia.club/~cyberia/support">https://lists.cyberia.club/~cyberia/support</a>
 </p>
 <p>
-  If you do not want your mail to appear in a public archive, email capsul@cyberia.club instead.
+  If you do not want your mail to appear in a public archive, email <a href="mailto:capsul@cyberia.club?subject=Please%20halp!">capsul@cyberia.club</a> instead.
 </p>
 <p>
   Please describe your problem or feature request, and we will do our best to get back to you promptly. Thank you very much.