diff --git a/content/posts/e2ee/index.md b/content/posts/e2ee/index.md
index 03a36de..d8d3edd 100644
--- a/content/posts/e2ee/index.md
+++ b/content/posts/e2ee/index.md
@@ -53,6 +53,7 @@ Any Cwtch user can turn the app on their phone or computer into an untrusted ser
 <details>
 <summary><strong>Cwtch Installation on Tails</strong></summary>
 <br>
+<p>Cwtch is still beta - support for Tails is very new and not yet thoroughly tested.</p>
 <ul>
 <li>Start Tails with an Adminstration Password.</li>
 <li>Download <a href="https://cwtch.im/download/#linux">Cwtch for Linux</a> using Tor Browser</li>
@@ -73,9 +74,12 @@ Any Cwtch user can turn the app on their phone or computer into an untrusted ser
 <li><code>exec env CWTCH_TAILS=true LD_LIBRARY_PATH=~/.local/lib/cwtch/:~/.local/lib/cwtch/Tor ~/.local/lib/cwtch/cwtch</code></li>
 </ul>
 </li>
-<li>Cwtch must be re-installed every session you need to use it. Backup <code>`$HOME/.cwtch`</code> to the personal data LUKS USB, and copy it back into <code>$HOME/</code> the next time you install Cwtch.</li>
-<li>Updates must be made manually - back up your profile first.</li>
+<li>How you use Cwtch depends on whether you have enabled Persistent Storage: <ul>
+<li>With Persistent Storage disabled, Cwtch must be re-installed every session you need to use it. Backup <code>`/home/amnesia/.cwtch/`</code> to the personal data LUKS USB, and copy it back into <code>/home/amnesia/</code> the next time you install Cwtch. </li>
+<li>With Persistent Storage enabled and unlocked, in Terminal run <code>sudo sed -i '$ a /home/amnesia/.cwtch source=cwtch' /live/persistence/TailsData_unlocked/persistence.conf</code></li>
 </ul>
+</li>
+<li>Updates must be made manually - back up your profile first.</li>
 <br>
 </details>
 
diff --git a/themes/DeepThought/templates/macros.html b/themes/DeepThought/templates/macros.html
index cdf8471..5c92797 100644
--- a/themes/DeepThought/templates/macros.html
+++ b/themes/DeepThought/templates/macros.html
@@ -81,7 +81,7 @@
 <p>
   Categories:
   {% for category in categories %}
-  <a class="has-text-info-dark has-text-weight-semibold" href="{{ get_taxonomy_url(kind="categories", name=category) }}">
+	  <a class="has-text-info-dark has-text-weight-semibold" href="/categories/{{category | lower}}">
     <span class="icon-text">
       <span class="icon">
         <i class="fas fa-cube"></i>
@@ -97,7 +97,7 @@
 <p>
   Tags:
   {% for tag in tags %}
-  <a class="has-text-info-dark has-text-weight-semibold" href="{{ get_taxonomy_url(kind='tags', name=tag) }}">
+	  <a class="has-text-info-dark has-text-weight-semibold" href="/tags/{{tag | lower}}">
     <span class="icon-text">
       <span class="icon">
         <i class="fas fa-tag"></i>