diff --git a/_templates/faq.html b/_templates/faq.html
index de2e1219..82969a83 100755
--- a/_templates/faq.html
+++ b/_templates/faq.html
@@ -122,29 +122,29 @@ id: faq
 </ul>
 </div>
 
-<h2><a name="{% translate general anchor.faq %}">General</a></h2>
+<h2 id="{% translate general anchor.faq %}">General</h2>
 
-<h3><a name="{% translate whatisbitcoin anchor.faq %}">{% translate whatisbitcoin %}</a></h3>
+<h3 id="{% translate whatisbitcoin anchor.faq %}">{% translate whatisbitcoin %}</h3>
 <p>{% translate whatisbitcointxt1 %}</p>
 
-<h3><a name="{% translate creator anchor.faq %}">{% translate creator %}</a></h3>
+<h3 id="{% translate creator anchor.faq %}">{% translate creator %}</h3>
 <p>{% translate creatortxt1 %}</p>
 <p>{% translate creatortxt2 %}</p>
 
-<h3><a name="{% translate whocontrols anchor.faq %}">{% translate whocontrols %}</a></h3>
+<h3 id="{% translate whocontrols anchor.faq %}">{% translate whocontrols %}</h3>
 <p>{% translate whocontrolstxt1 %}</p>
 
-<h3><a name="{% translate howitworks anchor.faq%}">{% translate howitworks %}</a></h3>
+<h3 id="{% translate howitworks anchor.faq%}">{% translate howitworks %}</h3>
 <p>{% translate howitworkstxt1 %}</p>
 <p>{% translate howitworkstxt2 %}</p>
 
-<h3><a name="{% translate used anchor.faq %}">{% translate used %}</a></h3>
+<h3 id="{% translate used anchor.faq %}">{% translate used %}</h3>
 <p>{% translate usedtxt1 %}</p>
 <p>
 <img src="/img/faq/merchants_map.png" alt="Screenshot">
 </p>
 
-<h3><a name="{% translate acquire anchor.faq %}">{% translate acquire %}</a></h3>
+<h3 id="{% translate acquire anchor.faq %}">{% translate acquire %}</h3>
 <ul>
   <li>{% translate acquireli1 %}</li>
   <li>{% translate acquireli2 %}</li>
@@ -153,14 +153,14 @@ id: faq
 </ul>
 <p>{% translate acquiretxt1 %}</p>
 
-<h3><a name="{% translate makepayment anchor.faq %}">{% translate makepayment %}</a></h3>
+<h3 id="{% translate makepayment anchor.faq %}">{% translate makepayment %}</h3>
 <p>{% translate makepaymenttxt1 %}</p>
 <p>
 <img src="/img/faq/mobile_send.png" alt="Screenshot">
 <img src="/img/faq/mobile_receive.png" alt="Screenshot">
 </p>
 
-<h3><a name="{% translate advantages anchor.faq %}">{% translate advantages %}</a></h3>
+<h3 id="{% translate advantages anchor.faq %}">{% translate advantages %}</h3>
 <ul>
   <li>{% translate advantagesli1 %}</li>
   <li>{% translate advantagesli2 %}</li>
@@ -169,155 +169,157 @@ id: faq
   <li>{% translate advantagesli5 %}</li>
 </ul>
 
-<h3><a name="{% translate disadvantages anchor.faq %}">{% translate disadvantages %}</a></h3>
+<h3 id="{% translate disadvantages anchor.faq %}">{% translate disadvantages %}</h3>
 <ul>
   <li>{% translate disadvantagesli1 %}</li>
   <li>{% translate disadvantagesli2 %}</li>
   <li>{% translate disadvantagesli3 %}</li>
 </ul>
 
-<h3><a name="{% translate trust anchor.faq %}">{% translate trust %}</a></h3>
+<h3 id="{% translate trust anchor.faq %}">{% translate trust %}</h3>
 <p>{% translate trusttxt1 %}</p>
 
-<h3><a name="{% translate makemoney anchor.faq %}">{% translate makemoney %}</a></h3>
+<h3 id="{% translate makemoney anchor.faq %}">{% translate makemoney %}</h3>
 <p>{% translate makemoneytxt1 %}</p>
 <p>{% translate makemoneytxt2 %}</p>
 
-<h3><a name="{% translate virtual anchor.faq %}">{% translate virtual %}</a></h3>
+<h3 id="{% translate virtual anchor.faq %}">{% translate virtual %}</h3>
 <p>{% translate virtualtxt1 %}</p>
 
-<h3><a name="{% translate anonymous anchor.faq %}">{% translate anonymous %}</a></h3>
+<h3 id="{% translate anonymous anchor.faq %}">{% translate anonymous %}</h3>
 <p>{% translate anonymoustxt1 %}</p>
 <p>{% translate anonymoustxt2 %}</p>
 
-<h3><a name="{% translate lost anchor.faq %}">{% translate lost %}</a></h3>
+<h3 id="{% translate lost anchor.faq %}">{% translate lost %}</h3>
 <p>{% translate losttxt1 %}</p>
 
-<h3><a name="{% translate scale anchor.faq %}">{% translate scale %}</a></h3>
+<h3 id="{% translate scale anchor.faq %}">{% translate scale %}</h3>
 <p>{% translate scaletxt1 %}</p>
 
-<h2><a name="{% translate legal anchor.faq %}">{% translate legal %}</a></h2>
+<h2 id="{% translate legal anchor.faq %}">{% translate legal %}</h2>
 
-<h3><a name="{% translate islegal anchor.faq %}">{% translate islegal %}</a></h3>
+<h3 id="{% translate islegal anchor.faq %}">{% translate islegal %}</h3>
 <p>{% translate islegaltxt1 %}</p>
 <p>{% translate islegaltxt2 %}</p>
 
-<h3><a name="{% translate illegalactivities anchor.faq %}">{% translate illegalactivities %}</a></h3>
+<h3 id="{% translate illegalactivities anchor.faq %}">{% translate illegalactivities %}</h3>
 <p>{% translate illegalactivitiestxt1 %}</p>
 <p>{% translate illegalactivitiestxt2 %}</p>
 <p>{% translate illegalactivitiestxt3 %}</p>
 
-<h3><a name="{% translate regulated anchor.faq %}">{% translate regulated %}</a></h3>
+<h3 id="{% translate regulated anchor.faq %}">{% translate regulated %}</h3>
 <p>{% translate regulatedtxt1 %}</p>
 <p>{% translate regulatedtxt2 %}</p>
 
-<h3><a name="{% translate taxes anchor.faq %}">{% translate taxes %}</a></h3>
+<h3 id="{% translate taxes anchor.faq %}">{% translate taxes %}</h3>
 <p>{% translate taxestxt1 %}</p>
 
-<h3><a name="{% translate consumer anchor.faq %}">{% translate consumer %}</a></h3>
+<h3 id="{% translate consumer anchor.faq %}">{% translate consumer %}</h3>
 <p>{% translate consumertxt1 %}</p>
 <p>{% translate consumertxt2 %}</p>
 
-<h2><a name="{% translate economy anchor.faq %}">{% translate economy %}</a></h2>
+<h2 id="{% translate economy anchor.faq %}">{% translate economy %}</h2>
 
-<h3><a name="{% translate bitcoinscreated anchor.faq %}">{% translate bitcoinscreated %}</a></h3>
+<h3 id="{% translate bitcoinscreated anchor.faq %}">{% translate bitcoinscreated %}</h3>
 <p>{% translate bitcoinscreatedtxt1 %}</p>
 <p>{% translate bitcoinscreatedtxt2 %}</p>
 <p>{% translate bitcoinscreatedtxt3 %}</p>
 
-<h3><a name="{% translate whyvalue anchor.faq %}">{% translate whyvalue %}</a></h3>
+<h3 id="{% translate whyvalue anchor.faq %}">{% translate whyvalue %}</h3>
 <p>{% translate whyvaluetxt1 %}</p>
 
-<h3><a name="{% translate whatprice anchor.faq %}">{% translate whatprice %}</a></h3>
+<h3 id="{% translate whatprice anchor.faq %}">{% translate whatprice %}</h3>
 <p>{% translate whatpricetxt1 %}</p>
 <p>{% translate whatpriceimg1 %}<br><img src="/img/faq/price_chart.png" alt="chart"></p>
 
-<h3><a name="{% translate worthless anchor.faq %}">{% translate worthless %}</a></h3>
+<h3 id="{% translate worthless anchor.faq %}">{% translate worthless %}</h3>
 <p>{% translate worthlesstxt1 %}</p>
 
-<h3><a name="{% translate bubble anchor.faq %}">{% translate bubble %}</a></h3>
+<h3 id="{% translate bubble anchor.faq %}">{% translate bubble %}</h3>
 <p>{% translate bubbletxt1 %}</p>
 
-<h3><a name="{% translate ponzi anchor.faq %}">{% translate ponzi %}</a></h3>
+<h3 id="{% translate ponzi anchor.faq %}">{% translate ponzi %}</h3>
 <p>{% translate ponzitxt1 %}</p>
 <p>{% translate ponzitxt2 %}</p>
 
-<h3><a name="{% translate earlyadopter anchor.faq %}">{% translate earlyadopter %}</a></h3>
+<h3 id="{% translate earlyadopter anchor.faq %}">{% translate earlyadopter %}</h3>
 <p>{% translate earlyadoptertxt1 %}</p>
 
-<h3><a name="{% translate finitelimitation anchor.faq %}">{% translate finitelimitation %}</a></h3>
+<h3 id="{% translate finitelimitation anchor.faq %}">{% translate finitelimitation %}</h3>
 <p>{% translate finitelimitationtxt1 %}</p>
 
-<h3><a name="{% translate deflationaryspiral anchor.faq %}">{% translate deflationaryspiral %}</a></h3>
+<h3 id="{% translate deflationaryspiral anchor.faq %}">{% translate deflationaryspiral %}</h3>
 <p>{% translate deflationaryspiraltxt1 %}</p>
 <p>{% translate deflationaryspiraltxt2 %}</p>
 <p>{% translate deflationaryspiraltxt3 %}</p>
 
-<h3><a name="{% translate speculationvolatility anchor.faq %}">{% translate speculationvolatility %}</a></h3>
+<h3 id="{% translate speculationvolatility anchor.faq %}">{% translate speculationvolatility %}</h3>
 <p>{% translate speculationvolatilitytxt1 %}</p>
 <p>{% translate speculationvolatilitytxt2 %}</p>
 
-<h3><a name="{% translate buyall anchor.faq %}">{% translate buyall %}</a></h3>
+<h3 id="{% translate buyall anchor.faq %}">{% translate buyall %}</h3>
 <p>{% translate buyalltxt1 %}</p>
 
-<h3><a name="{% translate bettercurrency anchor.faq %}">{% translate bettercurrency %}</a></h3>
+<h3 id="{% translate bettercurrency anchor.faq %}">{% translate bettercurrency %}</h3>
 <p>{% translate bettercurrencytxt1 %}</p>
 
-<h2><a name="{% translate transactions anchor.faq %}">{% translate transactions %}</a></h2>
+<h2 id="{% translate transactions anchor.faq %}">{% translate transactions %}</h2>
 
-<h3><a name="{% translate tenminutes anchor.faq %}">{% translate tenminutes %}</a></h3>
+<h3 id="{% translate tenminutes anchor.faq %}">{% translate tenminutes %}</h3>
 <p>{% translate tenminutestxt1 %}</p>
 
-<h3><a name="{% translate fee anchor.faq %}">{% translate fee %}</a></h3>
+<h3 id="{% translate fee anchor.faq %}">{% translate fee %}</h3>
 <p>{% translate feetxt1 %}</p>
 <p>{% translate feetxt2 %}</p>
 
-<h3><a name="{% translate poweredoff anchor.faq %}">{% translate poweredoff %}</a></h3>
+<h3 id="{% translate poweredoff anchor.faq %}">{% translate poweredoff %}</h3>
 <p>{% translate poweredofftxt1 %}</p>
 
-<h3><a name="{% translate sync anchor.faq %}">{% translate sync %}</a></h3>
+<h3 id="{% translate sync anchor.faq %}">{% translate sync %}</h3>
 <p>{% translate synctxt1 %}</p>
 
-<h2><a name="{% translate mining anchor.faq %}">{% translate mining %}</a></h2>
+<h2 id="{% translate mining anchor.faq %}">{% translate mining %}</h2>
 
-<h3><a name="{% translate whatismining anchor.faq %}">{% translate whatismining %}</a></h3>
+<h3 id="{% translate whatismining anchor.faq %}">{% translate whatismining %}</h3>
 <p>{% translate whatisminingtxt1 %}</p>
 
-<h3><a name="{% translate howminingworks anchor.faq %}">{% translate howminingworks %}</a></h3>
+<h3 id="{% translate howminingworks anchor.faq %}">{% translate howminingworks %}</h3>
 <p>{% translate howminingworkstxt1 %}</p>
 <p>{% translate howminingworkstxt2 %}</p>
 <p>{% translate howminingworkstxt3 %}</p>
 <p>{% translate howminingworkstxt4 %}</p>
 
-<h3><a name="{% translate miningwaste anchor.faq %}">{% translate miningwaste %}</a></h3>
+<h3 id="{% translate miningwaste anchor.faq %}">{% translate miningwaste %}</h3>
 <p>{% translate miningwastetxt1 %}</p>
 <p>{% translate miningwastetxt2 %}</p>
 
-<h3><a name="{% translate miningsecure anchor.faq %}">{% translate miningsecure %}</a></h3>
+<h3 id="{% translate miningsecure anchor.faq %}">{% translate miningsecure %}</h3>
 <p>{% translate miningsecuretxt1 %}</p>
 
-<h3><a name="{% translate miningstart anchor.faq %}">{% translate miningstart %}</a></h3>
+<h3 id="{% translate miningstart anchor.faq %}">{% translate miningstart %}</h3>
 <p>{% translate miningstarttxt1 %}</p>
 
-<h2><a name="{% translate security anchor.faq %}">{% translate security %}</a></h2>
+<h2 id="{% translate security anchor.faq %}">{% translate security %}</h2>
 
-<h3><a name="{% translate secure anchor.faq %}">{% translate secure %}</a></h3>
+<h3 id="{% translate secure anchor.faq %}">{% translate secure %}</h3>
 <p>{% translate securetxt1 %}</p>
 
-<h3><a name="{% translate hacked anchor.faq %}">{% translate hacked %}</a></h3>
+<h3 id="{% translate hacked anchor.faq %}">{% translate hacked %}</h3>
 <p>{% translate hackedtxt1 %}</p>
 <p>{% translate hackedtxt2 %}</p>
 
-<h3><a name="{% translate collude anchor.faq %}">{% translate collude %}</a></h3>
+<h3 id="{% translate collude anchor.faq %}">{% translate collude %}</h3>
 <p>{% translate colludetxt1 %}</p>
 <p>{% translate colludetxt2 %}</p>
 
-<h3><a name="{% translate quantum anchor.faq %}">{% translate quantum %}</a></h3>
+<h3 id="{% translate quantum anchor.faq %}">{% translate quantum %}</h3>
 <p>{% translate quantumtxt1 %}</p>
 
-<h2><a name="{% translate help anchor.faq %}">{% translate help %}</a></h2>
+<h2 id="{% translate help anchor.faq %}">{% translate help %}</h2>
 
-<h3><a name="{% translate morehelp anchor.faq %}">{% translate morehelp %}</a></h3>
+<h3 id="{% translate morehelp anchor.faq %}">{% translate morehelp %}</h3>
 <p>{% translate morehelptxt1 %}</p>
 
 {% endcase %}
+
+<script>addAnchorLinks();</script>
diff --git a/_templates/vocabulary.html b/_templates/vocabulary.html
index 9eb177c3..41f7be5a 100755
--- a/_templates/vocabulary.html
+++ b/_templates/vocabulary.html
@@ -30,6 +30,8 @@ voc:
 </div>
 
 {% alphab_for v in page.voc %}
-<h2><a name="{% translate {{v}} anchor.vocabulary %}">{% translate {{v}} %}</a></h2>
+<h2 id="{% translate {{v}} anchor.vocabulary %}">{% translate {{v}} %}</h2>
 <p>{% translate {{v}}txt %}</p>
 {% endalphab_for %}
+
+<script>addAnchorLinks();</script>