diff --git a/apps/addressbook/java/src/net/metanotion/package.html b/apps/addressbook/java/src/net/metanotion/package.html
index 45c7447064..bdf38bf029 100644
--- a/apps/addressbook/java/src/net/metanotion/package.html
+++ b/apps/addressbook/java/src/net/metanotion/package.html
@@ -19,7 +19,7 @@ the API may be subject to change.
 Contact I2P developers if you are considering use in another application.
 Following is the original documentation copied from metanotion website.
 </p>
-		<h1>Metanotion BlockFile Database</h1>
+		<h2>Metanotion BlockFile Database</h2>
 		<p>A 100% Java 1.3, BSD Licensed, embeddable single file database engine in 32KB. This database was designed for PDA based and J2ME applications.</p>
 
 		<h2>Table of Contents</h2>
diff --git a/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java b/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java
index deec8e3047..63778a4cd9 100644
--- a/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java
+++ b/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java
@@ -27,13 +27,13 @@ import net.i2p.util.Log;
  * This servlet generates <i>identicon</i> (visual identifier) images ranging
  * from 16x16 to 512x512 in size.
  * 
- * <h3>Supported Image Formats</h3>
+ * <h2>Supported Image Formats</h2>
  * <p>
  * Currently only PNG is supported because <code>javax.imageio</code> package
  * does not come with built-in GIF encoder and PNG is the only remaining
  * reasonable format.
  * </p>
- * <h3>Initialization Parameters:</h3>
+ * <h2>Initialization Parameters:</h2>
  * <blockquote>
  * <dl>
  * <dt>inetSalt</dt>
@@ -44,7 +44,7 @@ import net.i2p.util.Log;
  * (Optional)</dd>
  * </dl>
  * </blockquote>
- * <h3>Request ParametersP</h3>
+ * <h2>Request ParametersP</h2>
  * <blockquote>
  * <dl>
  * <dt>code</dt>
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java
index 126b638bbf..4fda6d5d75 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java
@@ -27,7 +27,7 @@ public class Ed25519LittleEndianEncoding extends Encoding {
      * </ol><p>
      * The idea for the modulo $p$ reduction algorithm is as follows:
      * </p>
-     * <h2>Assumption:</h2>
+     * <h4>Assumption:</h4>
      * <ul>
      * <li>$p = 2^{255} - 19$
      * <li>$h = h_0 + 2^{25} * h_1 + 2^{(26+25)} * h_2 + \dots + 2^{230} * h_9$ where $0 \le |h_i| \lt 2^{27}$ for all $i=0,\dots,9$.
@@ -35,7 +35,7 @@ public class Ed25519LittleEndianEncoding extends Encoding {
      * </ul><p>
      * Then $q = [2^{-255} * (h + 19 * 2^{-25} * h_9 + 1/2)]$ where $[x] = floor(x)$.
      * </p>
-     * <h2>Proof:</h2>
+     * <h4>Proof:</h4>
      * <p>
      * We begin with some very raw estimation for the bounds of some expressions:
      * <p>
diff --git a/core/java/src/net/i2p/data/i2cp/package.html b/core/java/src/net/i2p/data/i2cp/package.html
index 0d9bbda5c4..58e0274785 100644
--- a/core/java/src/net/i2p/data/i2cp/package.html
+++ b/core/java/src/net/i2p/data/i2cp/package.html
@@ -22,7 +22,7 @@ be added in the future. I2CP however does not expose any private keys across the
 wire - proof of authorization to collect messages for a Destination is provided by
 public key signatures.
 </p>
-<h1>Messages</h1>
+<h2>Messages</h2>
 <p>
 These classes are the currently defined messages in the Invisible Internet Client
 Protocol (I2CP), though common data structures are located in the I2P Common Data
diff --git a/router/java/src/com/maxmind/geoip2/DatabaseReader.java b/router/java/src/com/maxmind/geoip2/DatabaseReader.java
index 879c573893..3c6af9aed8 100644
--- a/router/java/src/com/maxmind/geoip2/DatabaseReader.java
+++ b/router/java/src/com/maxmind/geoip2/DatabaseReader.java
@@ -19,7 +19,7 @@ import java.util.Map;
  * The class {@code DatabaseReader} provides a reader for the GeoIP2 database
  * format.
  * </p>
- * <h3>Usage</h3>
+ * <h2>Usage</h2>
  * <p>
  * To use the database API, you must create a new {@code DatabaseReader} using
  * the {@code DatabaseReader.Builder}. You must provide the {@code Builder}
@@ -41,7 +41,7 @@ import java.util.Map;
  * expensive as it must read in metadata for the file. It is safe to share the
  * object across threads.
  * </p>
- * <h4>Caching</h4>
+ * <h3>Caching</h3>
  * <p>
  * The database API supports pluggable caching (by default, no caching is
  * performed). A simple implementation is provided by