diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
index 12b5658a2..ecb25a3fb 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -37,6 +37,7 @@ public class HomeHelper extends HelperBase {
 
     static final String DEFAULT_FAVORITES =
         _x("Bug Reports") + S + _x("Bug tracker") + S + "http://trac.i2p2.i2p/report/1" + S + I + "bug.png" + S +
+        "colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http://colombo-bt.i2p/" + S + I + "colomboicon.png" + S +
         _x("Dev Forum") + S + _x("Development forum") + S + "http://zzz.i2p/" + S + I + "itoopie_sm.png" + S +
         _x("diftracker") + S + _x("Bittorrent tracker") + S + "http://diftracker.i2p/" + S + I + "itoopie_sm.png" + S +
         "echelon.i2p" + S + _x("I2P Applications") + S + "http://echelon.i2p/" + S + I + "itoopie_sm.png" + S +
@@ -45,7 +46,7 @@ public class HomeHelper extends HelperBase {
         _x("Anonymous Git Hosting") + S + _x("A public anonymous Git hosting site - supports pulling via Git and HTTP and pushing via SSH") + S + "http://git.repo.i2p/" + S + I + "git-logo.png" + S +
         "Ident " + _x("Microblog") + S + _x("Your premier microblogging service on I2P") + S + "http://id3nt.i2p/" + S + I + "ident_icon_blue.png" + S +
         _x("Javadocs") + S + _x("Technical documentation") + S + "http://i2p-javadocs.i2p/" + S + I + "book.png" + S +
-        _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "book.png" + S +
+        //_x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "book.png" + S +
         _x("killyourtv.i2p") + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "itoopie_sm.png" + S +
         _x("Pastebin") + S + _x("I2P Pastebin") + S + "http://pastethis.i2p/" + S + I + "itoopie_sm.png" + S +
         "Planet I2P" + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "itoopie_sm.png" + S +
diff --git a/history.txt b/history.txt
index ba6702913..7795ea79b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2012-07-18 zzz
+ * Home page: Add colombo-bt.i2p, remove keys.i2p
+ * i2psnark: Clear rate stats when restarting torrent
+
 2012-07-16 str4d
  * console: work towards better integration
    - Wrapped the bundled apps in iFrames (with a link in the page header to
diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt
index 3274dfe32..b6ae538ca 100644
--- a/installer/resources/hosts.txt
+++ b/installer/resources/hosts.txt
@@ -335,3 +335,4 @@ i2p-javadocs.i2p=pihB-m2To7PT-EOY1x-K5PFeV1j~KTz7inAbpm82bJpeb-wdLJ1AocMMQ6feN2l
 plugins.i2p=4GdwNoyPq-tlATiocmygKgZv1gJ1Gr1XtZRQ1T-5RozH54aPDKuVp6E9eTdZm3PyJ~AVSo4aFViZSCoMwctE6v6Mg5iAxHysZqn1u3XsXjFg3FttFQOSxGjXkjQG98kA2K~yCrWbD-YAVANGrJsQ6VjXSWsKP95WIplSxcBA25vE~eLuFxvAgqLX0LWAvB~liSdI3QrDQ1YNhyaAn4sisLV9aViMncE90hjxBYR1llxsv5N4CKh9kPl3pNSfF0J9-kxGotqXGdVcXYjo18fpdEurGmghkz4JXgRMg7APcOy97XMjWNe~7Ct~Z17zxFzzQUYC4nSsDN0G2t~tp~VWzZtKDSDq1~B0~wfiN1srt2zBBDfcABWFw7SML4QfSiw6ipbXeJD8hWfVSS~oCMzf7zS4bPakieTigHsMjJ4OnLQtuatiXHgfY2hTuUbUvNhvzbKwQ2PPrOdbxFkzDoOazAsxTMFrDWKeZHYEAwSdWOIVJGxXmQe-r-BvYaMB00~5AAAA
 keys.i2p=Imqtlip0MVs9~UGTdl~FY1YV7QhpmzEM3xVjAnd5wxuKfq7xQN0RxfEadFzz2QkPW5QkFh2XyXRkkArZbgG1j0FudZYfmwfYcmxX-iDMsTFyh-J7AirXDmXLviZWOaUOU30NU1DcBUF-PrVc5rL2F1ML2KtqF2LeanRZHSjuIsZTzxMw5Nvb9nWIlFaBU8vwEdaH3zx3nRSujNki~v2DadexbpPQlwfHvVupwSOX6D79A63aO3mcuuJe756nu0kBaF~Bs4UZE1G2doZAUS6lFAJUTKjJDKsbz8RP76t6iL6IgqF8xD~Y-uP3yNazNaSTgWbEUSsoIe~oI-kGdoSFrGL0gGbBlyQRvXbz-lQPXqHjh5~RXeEgqkbSwjE0MF29U5S~1MmBaSJ1NmfMcAAkarAe44ub-LTAWkFvuA9mcjhDTpeFSRjxaKCmJZ-twbNrHqDY4EtVZvTWTpHYy3g4s2bR7OKFT26QdmLYfsa9fHGcy8TGDwAI9Pjov5bGa8LlAAAA
 killyourtv.i2p=qWUvUuLmH7MyjcxBcMbyD1c4aIypzlV79Jq5POkC12Yq5hLBs7pnHbJIYJm4BENze2COzuWPQSMXICV91Ig~Drpc5vYNiM~dsLKow7CoFJUcNnhHNBlC0C6Y2Un-ueF43rLp7kWUub3qflO93QoYOXiD~avWu1jiAmU1YsxVAeLwDDML9kQQ3uQtuXa2n0EqxHvfdRsFdD7k1WUg5Ocet64MMAehKTr4LalxymOfG7MlV-mbR7Czt~xumpuc95x~6M7470nq33FHrwcPGOvr-3cM1CBi7QpUeibYwODZSxtLVfUTjqB1TzrVKt2M-Wt9XyJa6c4wnpVoneD7sb2agnq0P-wiA3h-bpGLsx-SB4G82c6E8MUG6a~aLdsqMUdLSc7HMu5TQ55LXJKnJzrmWy~zaUKy28JhlXQgYG8NHriCwq1CstGEUCWIzQQYdvEY6PU8L5jCT5Zs1jklX~g6Sxrv-ooDeznJWraW4b-IsSGon0qObwyTvhavVqkwJ5jkAAAA
+colombo-bt.i2p=OlhoyOifYe50Fq3b3K3NU3vRvU9Qjzom9sqLuwQw4K3AgPHlpMuz7HuspDMnqvNoXqYs-eTNK83bNZ105eiG1y3p2SchC7Lf6WhEedBxllF0L1vWdmdbnb1COm6GoU~8xkOxHBjnJl302Z-YsfPtsQNs0SzWnbP03E0ZUYDX6lBwabgg2Jaygo2IyW9UcmP1GHoAcc4Vtj1LXsTV0IoeB2Zp1OOv9t~icuLVSm6Rpl-FAl7AN0PyzJDtNbSVcCb89AREO4V7uc22aDxofmvIGQDNtDqK5UxATT-TTlTvTPbsTV8w3qJLFXYHbjklbNiI8P3Z9e~RyVqiWgzRdCfii3pBQ2-akwV7zaXMdsUT9T5DRiOGxYmsXK0kgr84W4khnj7aDYOzZAlOsUw890hqY4vyaslMX-UpNry8KXyS-QK-323sPcGfGta5rKpxlCAlwQ8L4RnWggHVlKo-y5fLxSQsy~EBqZIOg-zgQiHUoCCUiYukL-2EOrWhmt8jRzsGAAAA
diff --git a/installer/resources/themes/console/images/colomboicon.png b/installer/resources/themes/console/images/colomboicon.png
new file mode 100644
index 000000000..b64020f17
Binary files /dev/null and b/installer/resources/themes/console/images/colomboicon.png differ
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 9319fc01c..0bd65feeb 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 22;
+    public final static long BUILD = 23;
 
     /** for example "-test" */
     public final static String EXTRA = "";