diff --git a/i2p2www/pages/site/docs/how/elgamal-aes.html b/i2p2www/pages/site/docs/how/elgamal-aes.html
index 571b07ad..e1bb884b 100644
--- a/i2p2www/pages/site/docs/how/elgamal-aes.html
+++ b/i2p2www/pages/site/docs/how/elgamal-aes.html
@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}ElGamal/AES + SessionTag Encryption{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}March 2014{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.12{% endblock %}
+{% block lastupdated %}{% trans %}January 2016{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.24{% endblock %}
 {% block content %}
 <h2>{% trans %}Overview{% endtrans %}</h2>
 <p>{% trans -%}
@@ -180,7 +180,8 @@ and the encrypted block is 514 bytes long.
 <p>{% trans -%}
 The unencrypted data in the AES block contains the following:
 {%- endtrans %}</p>
-<pre>
+
+{% highlight lang='dataspec' %}
    +----+----+----+----+----+----+----+----+
    |tag count|                             |
    +----+----+                             +
@@ -220,7 +221,10 @@ The unencrypted data in the AES block contains the following:
    +----+----+----//---+----+              +
    |          Padding to 16 bytes          |
    +----+----+----+----+----+----+----+----+
+{% endhighlight %}
 
+<h4>Definition</h4>
+{% highlight lang='dataspec' %}
 tag count: {% trans commonstructures=site_url('docs/spec/common-structures') -%}
 2-byte <a href="{{ commonstructures }}#type_Integer">Integer</a>, 0-200
 {%- endtrans %}
@@ -252,10 +256,10 @@ Padding: {% trans -%}
 Random data to a multiple of 16 bytes for the total length.
          May contain more than the minimum required padding.
 {%- endtrans %}
+{% endhighlight %}
 
 {% trans %}Minimum length: 48 bytes{% endtrans %}
 
-</pre>
 
 <p>{% trans cryptography=site_url('docs/how/cryptography') -%}
 The data is then <a href="{{ cryptography }}">AES Encrypted</a>,
@@ -287,7 +291,8 @@ ElGamal block.
 The existing session message is
 as follows:
 {%- endtrans %}</p>
-<pre>
+
+{% highlight lang='dataspec' %}
    +----+----+----+----+----+----+----+----+
    |                                       |
    +                                       +
@@ -305,15 +310,18 @@ as follows:
    +                                       +
    |                                       |
    +----+----+----+----+----+----+----+----+
+{% endhighlight %}
 
+<h4>Definition</h4>
+{% highlight lang='dataspec' %}
 Session Tag: {% trans commonstructures=site_url('docs/spec/common-structures') -%}
 A 32-byte <a href="{{ commonstructures }}#type_SessionTag">Session Tag</a>
              previously delivered in an AES block
 {%- endtrans %}
 
 AES Encrypyted Block: {% trans %}As specified <a href="#aes">above</a>.{% endtrans %}
+{% endhighlight %}
 
-</pre>
 
 <p>{% trans -%}
 The session tag also serves as