Index: footer.php
===================================================================
--- footer.php	(revision 7612)
+++ footer.php	(working copy)
@@ -1,23 +1,52 @@
+<?php // See the note in header.php about the global nature of the header/footer and the need for extensive testing when making changes ?>
 <div id="wporg-footer">
 	<div class="wrapper">
-		<p> 
-			<a href="http://wordpress.org/about/privacy/">Privacy</a> | 
-			<a href="http://wordpress.org/about/license/">License / GPLv2</a>
-            &nbsp; &nbsp; See also: 
-            <a href="http://wordpress.com/?ref=wporg-footer" title="Hassle-free WP hosting">Hosted WordPress.com</a> |
-			<a href="http://wordpress.tv/" title="Videos, tutorials, WordCamps">WordPress.TV Videos</a> |
-			<a href="http://central.wordcamp.org/" title="Find a WordPress event near your home">WordCamp Events</a> |
-			<a href="http://buddypress.org/" title="A set of plugins to transform your WordPress into a social network">BuddyPress Social Layer</a> |
-			<a href="http://bbpress.org/" title="Fast, slick forums built on WordPress">bbPress Forums</a> |
-			<a href="http://jobs.wordpress.net/" title="Find or post WordPress jobs">WP Jobs</a> |
-            <a href="http://ma.tt/" title="Co-founder of WordPress, an example of what WordPress can do">Matt</a>
-		</p>
-<br />
-<iframe src="//www.facebook.com/plugins/like.php?app_id=121415197926116&amp;href=http%3A%2F%2Fwww.facebook.com%2Fwordpress&amp;send=false&amp;layout=button_count&amp;width=150&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=lucida+grande&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:150px; height:21px;" allowTransparency="true"></iframe>
-<iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name=WordPress&show_count=false" style="width:150px; height:20px;"></iframe>
+		<ul>
+			<li><a href="http://wordpress.org/about/" title="An introduction to the WordPress project">About</a></li>
+			<li><a href="http://wordpress.org/news/" title="News and Updates">Blog</a></li>
+			<li><a href="http://wordpress.org/hosting/" title="Recommended web hosting providers">Hosting</a></li>
+			<li><a href="http://jobs.wordpress.net/" title="Find or post WordPress jobs">Jobs</a></li>
+		</ul>
 
-		<h6>Code is Poetry</h6>
+		<ul>
+			<li><a href="http://wordpress.org/support/" title="Forums, documentation, and other resources">Support</a></li>
+			<?php // <li><a href="http://developer.wordpress.org" title="Resources for WordPress developers">Developer</a></li> ?>
+			<li><a href="http://make.wordpress.org/" title="Give back to WordPress through code, support, translation and more">Get Involved</a></li>
+			<li><a href="http://learn.wordpress.org/" title="Workshops and training materials">Learn</a></li>
+		</ul>
+
+		<ul>
+			<li><a href="http://wordpress.org/showcase/" title="Some of the best WordPress sites on the Web">Showcase</a></li>
+			<li><a href="http://wordpress.org/plugins/" title="Add extra functionality to WordPress">Plugins</a></li>
+			<li><a href="http://wordpress.org/themes/" title="Make your WordPress pretty">Themes</a></li>
+			<li><a href="http://wordpress.org/ideas/" title="Share your ideas for improving WordPress">Ideas</a></li>
+		</ul>
+
+		<ul>
+			<li><a href="http://central.wordcamp.org/" title="Find a WordPress event near you">WordCamp</a></li>
+			<li><a href="http://wordpress.tv/" title="Videos, tutorials, and WordCamp sessions">WordPress.TV</a></li>
+			<li><a href="http://buddypress.org/" title="A set of plugins to transform your WordPress into a social network">BuddyPress</a></li>
+			<li><a href="http://bbpress.org/" title="Fast, slick forums built on WordPress">bbPress</a></li>
+		</ul>
+
+		<ul>
+			<li><a href="http://wordpress.com/?ref=wporg-footer" title="Hassle-free WordPress hosting">WordPress.com</a></li>
+			<li><a href="http://ma.tt/" title="Co-founder of WordPress, an example of what WordPress can do">Matt</a></li>
+			<li><a href="http://wordpress.org/about/privacy/" title="WordPress.org Privacy Policy">Privacy</a></li>
+			<li><a href="http://wordpress.org/about/license/" title="WordPress is open source software">License / GPLv2</a></li>
+		</ul>
+
+		<ul>
+			<li>
+				<iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name=WordPress&show_count=false" style="width:135px; height:20px;"></iframe>
+			</li>
+			<li>
+				<iframe src="//www.facebook.com/plugins/like.php?app_id=121415197926116&amp;href=http%3A%2F%2Fwww.facebook.com%2Fwordpress&amp;send=false&amp;layout=button_count&amp;width=135&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=lucida+grande&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:135px; height:21px;" allowTransparency="true"></iframe>
+			</li>
+		</ul>
 	</div>
+
+	<h6 class="aligncenter">Code is Poetry</h6>
 </div>
 
 <?php if ('wordpress.org' == $_SERVER['HTTP_HOST'] && in_array( $_SERVER['REQUEST_URI'], array( '/', '/download/', '/support/' ) ) ) : ?>
Index: style/blog-wp4.css
===================================================================
--- style/blog-wp4.css	(revision 62)
+++ style/blog-wp4.css	(working copy)
@@ -27,88 +27,4 @@
 .storycontent div.googleplus1_button {
 	margin-top: 0;
 	margin-bottom: 0;
-}
-
-/* =WordPress Core
--------------------------------------------------------------- */
-.alignnone {
-    margin: 5px 20px 20px 0;
-}
-
-.aligncenter,
-div.aligncenter {
-    display: block;
-    margin: 5px auto 5px auto;
-}
-
-.alignright {
-    float:right;
-    margin: 5px 0 20px 20px;
-}
-
-.alignleft {
-    float: left;
-    margin: 5px 20px 20px 0;
-}
-
-.aligncenter {
-    display: block;
-    margin: 5px auto 5px auto;
-}
-
-a img.alignright {
-    float: right;
-    margin: 5px 0 20px 20px;
-}
-
-a img.alignnone {
-    margin: 5px 20px 20px 0;
-}
-
-a img.alignleft {
-    float: left;
-    margin: 5px 20px 20px 0;
-}
-
-a img.aligncenter {
-    display: block;
-    margin-left: auto;
-    margin-right: auto
-}
-
-.wp-caption {
-    background: #fff;
-    border: 1px solid #f0f0f0;
-    max-width: 96%; /* Image does not overflow the content area */
-    padding: 5px 3px 10px;
-    text-align: center;
-}
-
-.wp-caption.alignnone {
-    margin: 5px 20px 20px 0;
-}
-
-.wp-caption.alignleft {
-    margin: 5px 20px 20px 0;
-}
-
-.wp-caption.alignright {
-    margin: 5px 0 20px 20px;
-}
-
-.wp-caption img {
-    border: 0 none;
-    height: auto;
-    margin: 0;
-    max-width: 98.5%;
-    padding: 0;
-    width: auto;
-}
-
-.wp-caption p.wp-caption-text {
-    font-size: 11px;
-    line-height: 17px;
-    margin: 0;
-    padding: 0 4px 5px;
-}
-
+}
\ No newline at end of file
Index: style/wp4.css
===================================================================
--- style/wp4.css	(revision 62)
+++ style/wp4.css	(working copy)
@@ -14,10 +14,13 @@
 	font-family: sans-serif;
 	line-height: 22px;
 	color: #444;
-	margin-bottom: 40px;
 }
 /* -------------------------------------------- */
 
+html, body {
+	position: relative;  /* this is necessary for children to properly use position: absolute */
+}
+
 code, pre { font-family: Consolas, Monaco, "Courier New", Courier, monospace; color: #000; }
 
 pre {
@@ -71,6 +74,92 @@
 	font-size: 80%;
 }
 
+
+/* =WordPress Core
+-------------------------------------------------------------- */
+.alignnone {
+	margin: 5px 20px 20px 0;
+}
+
+.aligncenter,
+div.aligncenter {
+	display: block;
+	margin: 5px auto 5px auto;
+}
+
+.alignright {
+	float:right;
+	margin: 5px 0 20px 20px;
+}
+
+.alignleft {
+	float: left;
+	margin: 5px 20px 20px 0;
+}
+
+.aligncenter {
+	display: block;
+	margin: 5px auto 5px auto;
+}
+
+a img.alignright {
+	float: right;
+	margin: 5px 0 20px 20px;
+}
+
+a img.alignnone {
+	margin: 5px 20px 20px 0;
+}
+
+a img.alignleft {
+	float: left;
+	margin: 5px 20px 20px 0;
+}
+
+a img.aligncenter {
+	display: block;
+	margin-left: auto;
+	margin-right: auto
+}
+
+.wp-caption {
+	background: #fff;
+	border: 1px solid #f0f0f0;
+	max-width: 96%; /* Image does not overflow the content area */
+	padding: 5px 3px 10px;
+	text-align: center;
+}
+
+.wp-caption.alignnone {
+	margin: 5px 20px 20px 0;
+}
+
+.wp-caption.alignleft {
+	margin: 5px 20px 20px 0;
+}
+
+.wp-caption.alignright {
+	margin: 5px 0 20px 20px;
+}
+
+.wp-caption img {
+	border: 0 none;
+	height: auto;
+	margin: 0;
+	max-width: 98.5%;
+	padding: 0;
+	width: auto;
+}
+
+.wp-caption p.wp-caption-text {
+	font-size: 11px;
+	line-height: 17px;
+	margin: 0;
+	padding: 0 4px 5px;
+}
+
+/* */
+
 .wrapper {
 	width: 960px;
 	margin: 0 auto;
@@ -881,37 +970,49 @@
 
 #wporg-footer {
 	clear: both;
-	border-top: 1px solid #dedede;
-	padding: 6px 14px;
-	width: 932px;
+	overflow: auto;
+	min-width: 932px;
 	margin: 0 auto;
+	padding: 22px 14px 65px 14px;
+	border-top: 1px solid #dfdfdf;
+	background-color: #f7f7f7;
 }
 
 #wporg-footer .wrapper {
+	overflow: auto;
 	width: 932px;
 }
 
-#wporg-footer p {
-	font-size: 12px;
+#wporg-footer ul {
 	float: left;
+	overflow: auto;
+	width: 135px;
+	margin-left: 24px;
+}
+
+#wporg-footer ul:first-child {
+	margin-left: 0;
+}
+
+#wporg-footer ul li {
+	font-size: 14px;
+	margin-bottom: 1px;
 	color: #bbb;
+	list-style-type: none;
 }
 
-#wporg-footer p a {
+#wporg-footer ul li a {
 	border: none;
 }
 
 #wporg-footer h6 {
-	float: right;
-}
-
-#wporg-footer h6 {
+	clear: both;
 	background: url(http://s.wordpress.org/style/images/codeispoetry.png?1) center center no-repeat;
-	background-size: 133px 11px;
-	width: 133px;
-	height: 11px;
+	background-size: 190px 15px;
+	width: 190px;
+	height: 15px;
 	text-indent: -9999px;
-	margin-top: 6px;
+	margin-top: 50px;
 }
 .no-static #wporg-footer h6 {
 	background-image: url(//wordpress.org/style/images/codeispoetry.png?1);
@@ -1435,3 +1536,8 @@
 	color: #555;
 }
 
+img#wpstats {
+	position: absolute;
+	left: 5px;
+	bottom: 5px;
+}
\ No newline at end of file
Index: wp-content/themes/pub/wporg-learn/footer.php
===================================================================
--- wp-content/themes/pub/wporg-learn/footer.php	(revision 62)
+++ wp-content/themes/pub/wporg-learn/footer.php	(working copy)
@@ -1,3 +1,5 @@
+</div> <!-- /#wrapper -->
+
 <?php
 require WPORGPATH . 'footer.php';
 
Index: translate/glotpress/css/style.css
===================================================================
--- translate/glotpress/css/style.css	(revision 800)
+++ translate/glotpress/css/style.css	(working copy)
@@ -30,10 +30,16 @@
 	margin-top: 19px;
 }
 /* we take the liberty to make visited the same as link */
-a, a:link, a:visited {
+.gp-content a,
+.gp-content a:link,
+.gp-content a:visited,
+#gp-footer a,
+#gp-footer a:link,
+#gp-footer a:visited {
     color: #2F34B8;
 }
-a:active {
+.gp-content a:active,
+#gp-footer a:active {
     color: red;
 }
 a img {