diff --git a/archive.html b/archive.html
index b010de333e74d66906857a2e063096c69b3392cc_YXJjaGl2ZS5odG1s..272637cfd9095f3ff1281f94108313fde6b65616_YXJjaGl2ZS5odG1s 100644
--- a/archive.html
+++ b/archive.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/compat.html b/compat.html
index b010de333e74d66906857a2e063096c69b3392cc_Y29tcGF0Lmh0bWw=..272637cfd9095f3ff1281f94108313fde6b65616_Y29tcGF0Lmh0bWw= 100644
--- a/compat.html
+++ b/compat.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/contact.html b/contact.html
index b010de333e74d66906857a2e063096c69b3392cc_Y29udGFjdC5odG1s..272637cfd9095f3ff1281f94108313fde6b65616_Y29udGFjdC5odG1s 100644
--- a/contact.html
+++ b/contact.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/don2.html b/don2.html
index b010de333e74d66906857a2e063096c69b3392cc_ZG9uMi5odG1s..272637cfd9095f3ff1281f94108313fde6b65616_ZG9uMi5odG1s 100644
--- a/don2.html
+++ b/don2.html
@@ -2,7 +2,7 @@
   <li>
     <!-- <a href="#" onclick="stm_donate(); return false;">Donate towards STM in pypy</a><br/> -->
     <!-- <a href="#" onclick="py3k_donate(); return false;">Donate towards py3k in pypy</a><br/> -->
-    <a href="#" onclick="general_donate(); return false;"><b>Donate towards general pypy progress</b></a><br/>
+    <b>Donate towards general pypy progress</b><br/>
     <!-- a href="#" onclick="numpy_donate(); return false;">Donate towards NumPy in pypy</a><br/ --!>
   </li>
   <li>
diff --git a/download.html b/download.html
index b010de333e74d66906857a2e063096c69b3392cc_ZG93bmxvYWQuaHRtbA==..272637cfd9095f3ff1281f94108313fde6b65616_ZG93bmxvYWQuaHRtbA== 100644
--- a/download.html
+++ b/download.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/features.html b/features.html
index b010de333e74d66906857a2e063096c69b3392cc_ZmVhdHVyZXMuaHRtbA==..272637cfd9095f3ff1281f94108313fde6b65616_ZmVhdHVyZXMuaHRtbA== 100644
--- a/features.html
+++ b/features.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/howtohelp.html b/howtohelp.html
index b010de333e74d66906857a2e063096c69b3392cc_aG93dG9oZWxwLmh0bWw=..272637cfd9095f3ff1281f94108313fde6b65616_aG93dG9oZWxwLmh0bWw= 100644
--- a/howtohelp.html
+++ b/howtohelp.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/index.html b/index.html
index b010de333e74d66906857a2e063096c69b3392cc_aW5kZXguaHRtbA==..272637cfd9095f3ff1281f94108313fde6b65616_aW5kZXguaHRtbA== 100644
--- a/index.html
+++ b/index.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/numpydonate.html b/numpydonate.html
index b010de333e74d66906857a2e063096c69b3392cc_bnVtcHlkb25hdGUuaHRtbA==..272637cfd9095f3ff1281f94108313fde6b65616_bnVtcHlkb25hdGUuaHRtbA== 100644
--- a/numpydonate.html
+++ b/numpydonate.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/people.html b/people.html
index b010de333e74d66906857a2e063096c69b3392cc_cGVvcGxlLmh0bWw=..272637cfd9095f3ff1281f94108313fde6b65616_cGVvcGxlLmh0bWw= 100644
--- a/people.html
+++ b/people.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/performance.html b/performance.html
index b010de333e74d66906857a2e063096c69b3392cc_cGVyZm9ybWFuY2UuaHRtbA==..272637cfd9095f3ff1281f94108313fde6b65616_cGVyZm9ybWFuY2UuaHRtbA== 100644
--- a/performance.html
+++ b/performance.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/py3donate.html b/py3donate.html
index b010de333e74d66906857a2e063096c69b3392cc_cHkzZG9uYXRlLmh0bWw=..272637cfd9095f3ff1281f94108313fde6b65616_cHkzZG9uYXRlLmh0bWw= 100644
--- a/py3donate.html
+++ b/py3donate.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/source/_layouts/site.genshi b/source/_layouts/site.genshi
index b010de333e74d66906857a2e063096c69b3392cc_c291cmNlL19sYXlvdXRzL3NpdGUuZ2Vuc2hp..272637cfd9095f3ff1281f94108313fde6b65616_c291cmNlL19sYXlvdXRzL3NpdGUuZ2Vuc2hp 100644
--- a/source/_layouts/site.genshi
+++ b/source/_layouts/site.genshi
@@ -63,8 +63,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px"/></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
diff --git a/sponsor.html b/sponsor.html
index b010de333e74d66906857a2e063096c69b3392cc_c3BvbnNvci5odG1s..272637cfd9095f3ff1281f94108313fde6b65616_c3BvbnNvci5odG1s 100644
--- a/sponsor.html
+++ b/sponsor.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/success.html b/success.html
index b010de333e74d66906857a2e063096c69b3392cc_c3VjY2Vzcy5odG1s..272637cfd9095f3ff1281f94108313fde6b65616_c3VjY2Vzcy5odG1s 100644
--- a/success.html
+++ b/success.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/tmdonate.html b/tmdonate.html
index b010de333e74d66906857a2e063096c69b3392cc_dG1kb25hdGUuaHRtbA==..272637cfd9095f3ff1281f94108313fde6b65616_dG1kb25hdGUuaHRtbA== 100644
--- a/tmdonate.html
+++ b/tmdonate.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />
diff --git a/tmdonate2.html b/tmdonate2.html
index b010de333e74d66906857a2e063096c69b3392cc_dG1kb25hdGUyLmh0bWw=..272637cfd9095f3ff1281f94108313fde6b65616_dG1kb25hdGUyLmh0bWw= 100644
--- a/tmdonate2.html
+++ b/tmdonate2.html
@@ -33,8 +33,6 @@
     <div id="menu-follow">
     <div><a href="https://bitbucket.org/pypy/pypy"><img src="https://www.selenic.com/hg-logo/logo-droplets-25.png" width="14px" height="14px" /></a></div>
 		<div><a href="http://feeds.feedburner.com/PyPyStatusBlog" title="Subscribe to the RSS Feed"><img src="https://feedburner.google.com/fb/lib/images/icons/feed-icon-12x12-orange.gif" alt="Subscribe to the RSS Feed" width="14px" height="14px" /></a></div>
-      <div><a href="http://flattr.com/thing/1191749/PyPy" target="_blank">
-      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></div>
     </div>
 	<div id="logo"><a href="http://pypy.org"><img src="image/pypy-logo.png" alt="PyPy" height="110px" /></a></div>
 	<hr class="clear-left" />