diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index e0bed1db96319fae793a24276ef42898a710459b..5e9aa0cb07f68c002db381001adbee1eb8614eaf 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -15,142 +15,144 @@
Older releases are at the bottom of the page.
</p>
-<h2 id="1.5.0">1.5.0 (API 0.9.51)</h2>
-<p><b>Released: Aug. 23, 2021</b></p>
+<h2 id="2.4.0">2.4.0 (API 0.9.60)</h2>
+<p><b>Target release: September 2023</b></p>
<ul>
<li>
- Accelerate rekeying routers to ECIES
+ NetDB context management
</li>
<li>
- Start work on SSU2
- </li>
- <li>
- Implement new tunnel build messages (proposal 157)
+ Streaming replay fix
</li>
<li>
- Support dmg and exe automatic updates
+ Handle congestion capabilities by deprioritizing overloaded routers
</li>
<li>
- New native OSX installer
+ "Install Plugin from File" command-line option
</li>
<li>
- X-I2P-Location(alt-svc) locations for built-in I2P Site
+ Generic UDP Tunnels in HSM
</li>
<li>
- RRD4J 3.8
+ Revive Android helper library
</li>
<li>
- Create C, CGo, SWIG bindings for libi2pd
+ Website Migration
</li>
</ul>
-
-
-
-<h2 id="1.6.1">1.6.1 (API 0.9.52)</h2>
-<p><b>Released: Nov. 29, 2021</b></p>
+<h2 id="2.3.0">2.3.0 (API 0.9.59)</h2>
+<p><b>Target release: June 2023</b></p>
<ul>
<li>
- Accelerate rekeying routers to ECIES
+ Tunnel peer selection improvements
</li>
<li>
- SSU performance improvements
+ User-Configurable blocklist expiration
</li>
<li>
- Improve SSU peer test security
+ Throttle fast bursts of lookup from same source
</li>
<li>
- Add theme selection to new-install wizard
+ Fix replay detection information leak
</li>
<li>
- Continue work on SSU2 (proposal 159)
+ NetDB fixes for multihomed leaseSets
</li>
<li>
- Send new tunnel build messages (proposal 157)
+ NetDB fixes for leaseSets which were received as a reply before being recieved as a store
</li>
+</ul>
+
+<h2 id="2.2.0">2.2.0 (API 0.9.58)</h2>
+<p><b>Target release: April 2023</b></p>
+<ul>
<li>
- Include automatic browser configuration tool in IzPack installer
+ Tunnel peer selection improvements
</li>
<li>
- Make Fork-and-Exec Plugins Managable
+ Streaming replay fix
</li>
+</ul>
+
+<h2 id="2.1.0">2.1.0 (API 0.9.57)</h2>
+<p><b>Released: January 10, 2023</b></p>
+<ul>
<li>
- Document jpackage install processes
+ SSU2 fixes
</li>
<li>
- Complete, document Go/Java Plugin Generation Tools
+ Tunnel build congestion fixes
</li>
<li>
- Reseed Plugin - Run a self-signed HTTPS reseed as a Java router plugin with no configuration.
+ SSU peer test and symmetric NAT detction fixes
</li>
-</ul>
-
-
-
-
-
-<h2 id="1.7.0">1.7.0 (API 0.9.53)</h2>
-<p><b>Released: Feb. 21, 2022</b></p>
-<ul>
<li>
- Remove BOB
+ Fix broken LS2 encrypted leasesets
</li>
<li>
- New i2psnark torrent editor
+ Option to disable SSU 1 (preliminary)
</li>
<li>
- i2psnark standalone fixes and improvements
+ Compressible padding (proposal 161)
</li>
<li>
- NetDB reliability improvements
+ New console peers status tab
</li>
<li>
- Add popup messages in systray
+ Add torsocks support to SOCKS proxy and other SOCKS improvements and fixes
</li>
+</ul>
+
+<h2 id="2.0.0">2.0.0 (API 0.9.56)</h2>
+<p><b>Released: November 21, 2022</b></p>
+<ul>
<li>
- NTCP2 performance improvements
+ SSU2 connection migration
</li>
<li>
- Remove outbound tunnel when first hop fails
+ SSU2 immediate acks
</li>
<li>
- Fallback to exploratory for tunnel build reply after repeated client tunnel build failures
+ Enable SSU2 by default
</li>
<li>
- Restore tunnel same-IP restrictions
+ SHA-256 digest proxy authentication in i2ptunnel
</li>
<li>
- Refactor i2ptunnel UDP support for I2CP ports
+ Update Android build process to use modern AGP, end need of deprecated Maven plugin in Android build
</li>
<li>
- Continue work on SSU2, start implementation (proposal 159)
+ Cross-Platform(Desktop) I2P browser auto-configuration support
</li>
+</ul>
+
+<h2 id="1.9.0">1.9.0 (API 0.9.55)</h2>
+<p><b>Released: August 22, 2022</b></p>
+<ul>
<li>
- Create Debian/Ubuntu Package of I2P Browser Profile
+ SSU2 peer test and relay implementation
</li>
<li>
- Create Plugin of I2P Browser Profile
+ SSU2 fixes
</li>
<li>
- Document I2P for Android applications
+ SSU MTU/PMTU improvements
</li>
<li>
- i2pcontrol improvements
+ Enable SSU2 for a small portion of routers
</li>
<li>
- Plugin support improvements
+ Add deadlock detector
</li>
<li>
- New local outproxy plugin
+ More certificate import fixes
</li>
<li>
- IRCv3 message tag support
+ Fix i2psnark DHT restart after router restart
</li>
</ul>
-
-
-
<h2 id="1.8.0">1.8.0 (API 0.9.54)</h2>
<p><b>Released: May 23, 2022</b></p>
<ul>
@@ -198,126 +200,131 @@
</li>
</ul>
-
-
-
-<h2 id="1.9.0">1.9.0 (API 0.9.55)</h2>
-<p><b>Released: August 22, 2022</b></p>
+<h2 id="1.7.0">1.7.0 (API 0.9.53)</h2>
+<p><b>Released: Feb. 21, 2022</b></p>
<ul>
<li>
- SSU2 peer test and relay implementation
+ Remove BOB
</li>
<li>
- SSU2 fixes
+ New i2psnark torrent editor
</li>
<li>
- SSU MTU/PMTU improvements
+ i2psnark standalone fixes and improvements
</li>
<li>
- Enable SSU2 for a small portion of routers
+ NetDB reliability improvements
</li>
<li>
- Add deadlock detector
+ Add popup messages in systray
</li>
<li>
- More certificate import fixes
+ NTCP2 performance improvements
</li>
<li>
- Fix i2psnark DHT restart after router restart
+ Remove outbound tunnel when first hop fails
</li>
-</ul>
-
-
-
-
-
-<h2 id="2.0.0">2.0.0 (API 0.9.56)</h2>
-<p><b>Released: November 21, 2022</b></p>
-<ul>
<li>
- SSU2 connection migration
+ Fallback to exploratory for tunnel build reply after repeated client tunnel build failures
</li>
<li>
- SSU2 immediate acks
+ Restore tunnel same-IP restrictions
</li>
<li>
- Enable SSU2 by default
+ Refactor i2ptunnel UDP support for I2CP ports
</li>
<li>
- SHA-256 digest proxy authentication in i2ptunnel
+ Continue work on SSU2, start implementation (proposal 159)
</li>
<li>
- Update Android build process to use modern AGP, end need of deprecated Maven plugin in Android build
+ Create Debian/Ubuntu Package of I2P Browser Profile
</li>
<li>
- Cross-Platform(Desktop) I2P browser auto-configuration support
+ Create Plugin of I2P Browser Profile
+ </li>
+ <li>
+ Document I2P for Android applications
+ </li>
+ <li>
+ i2pcontrol improvements
+ </li>
+ <li>
+ Plugin support improvements
+ </li>
+ <li>
+ New local outproxy plugin
+ </li>
+ <li>
+ IRCv3 message tag support
</li>
</ul>
-
-
-
-<h2 id="2.1.0">2.1.0 (API 0.9.57)</h2>
-<p><b>Released: January 10, 2023</b></p>
+<h2 id="1.6.1">1.6.1 (API 0.9.52)</h2>
+<p><b>Released: Nov. 29, 2021</b></p>
<ul>
<li>
- SSU2 fixes
+ Accelerate rekeying routers to ECIES
</li>
<li>
- Tunnel build congestion fixes
+ SSU performance improvements
</li>
<li>
- SSU peer test and symmetric NAT detction fixes
+ Improve SSU peer test security
</li>
<li>
- Fix broken LS2 encrypted leasesets
+ Add theme selection to new-install wizard
</li>
<li>
- Option to disable SSU 1 (preliminary)
+ Continue work on SSU2 (proposal 159)
</li>
<li>
- Compressible padding (proposal 161)
+ Send new tunnel build messages (proposal 157)
</li>
<li>
- New console peers status tab
+ Include automatic browser configuration tool in IzPack installer
</li>
<li>
- Add torsocks support to SOCKS proxy and other SOCKS improvements and fixes
+ Make Fork-and-Exec Plugins Managable
+ </li>
+ <li>
+ Document jpackage install processes
+ </li>
+ <li>
+ Complete, document Go/Java Plugin Generation Tools
+ </li>
+ <li>
+ Reseed Plugin - Run a self-signed HTTPS reseed as a Java router plugin with no configuration.
</li>
</ul>
-
-
-<h2 id="2.2.0">2.2.0 (API 0.9.58)</h2>
-<p><b>Target release: April 2023</b></p>
+<h2 id="1.5.0">1.5.0 (API 0.9.51)</h2>
+<p><b>Released: Aug. 23, 2021</b></p>
<ul>
<li>
- Tunnel peer selection improvements
+ Accelerate rekeying routers to ECIES
+ </li>
+ <li>
+ Start work on SSU2
</li>
<li>
- i2psnark UDP tracker support (proposal 160) ?
+ Implement new tunnel build messages (proposal 157)
</li>
<li>
- Custom reseed service entry for Android
+ Support dmg and exe automatic updates
</li>
<li>
- UDP Hidden Service/Client support in Hidden Services Manager
+ New native OSX installer
</li>
<li>
- Automatic reseed servers from .onion URLs
+ X-I2P-Location(alt-svc) locations for built-in I2P Site
</li>
<li>
- VPN-Mode Support in Android for browser configuration
+ RRD4J 3.8
</li>
<li>
- Fix WebSockets in HTTP Server Tunnels
+ Create C, CGo, SWIG bindings for libi2pd
</li>
</ul>
-
-
-
-
-
<h4><a href="roadmap-archive">{% trans %}Looking for older releases? Check the roadmap archive by following this link.{% endtrans %}</a></h4>
{% endblock %}