diff --git a/images/sprites.png b/images/sprites.png
index 9b3ff7532..9721fce0a 100644
Binary files a/images/sprites.png and b/images/sprites.png differ
diff --git a/styles/doc.css b/styles/doc.css
index 62de94183..ab24f5ea5 100755
--- a/styles/doc.css
+++ b/styles/doc.css
@@ -39,6 +39,16 @@ aside#quicktoc {
 
 /* }}} */
 
+.docs .classsynopsis:before,
+.docs div.refsect1:before,
+.docs div.warning:before {
+    content:" ";
+    position:absolute;
+    top:0;
+    left:0;
+    right:0;
+    bottom:0;
+}
 /* {{{ General styles (p, parameters, initializers, ...) */
 .docs .methodname b, .docs .methodname strong {
     color: #000;
@@ -47,6 +57,10 @@ aside#quicktoc {
 .docs .refsect1 .methodparam .parameter {
     cursor:pointer;
 }
+.docs .refsect1 dt,
+.docs .refsect1 p {
+    height:1.5em;
+}
 
 .docs .parameter {
     color: #336;
@@ -93,13 +107,16 @@ aside#quicktoc {
 .docs div.warning b.warning,
 .docs div.tip strong.tip,
 .docs div.warning strong.warning {
-    font-size: 1.7em;
+    font-size: 1.5em;
+    line-height: 2;
+    display:block;
+    text-align: center;
 }
 
 .docs div.tip p,
 .docs div.warning p {
-    padding-left: 60px;
-    text-align: justify;
+    padding-left: 1em;
+    text-align: left;
 }
 
 .docs div.warning div.example-contents {
@@ -119,22 +136,31 @@ aside#quicktoc {
 
 .docs div.tip,
 .docs div.warning {
-    text-align: center;
-    margin: 20px 2% 20px 2%;
-    padding: 5px 15px 5px 45px;
-    min-height: 100px;
+    position: relative;
+    z-index:10;
+    margin: 1.5em;
+    padding: 1.5em 1.5em 1.5em 92px;
+    min-height: 96px;
     background-position: 16px;
 }
+.docs div.tip:before,
+.docs div.warning:before {
+    z-index:-1;
+    top:-.25em;
+    border-top:.25em solid;
+}
 .docs div.warning {
-    border-top: 3px solid #9f8a8a;
-    border-bottom: 1px solid #9f8a8a;
     background: #f2e5f4 url('/images/dialog-warning.png') left center no-repeat;
 }
+.docs div.warning:before {
+    border-color:#9f8a8a;
+}
 .docs div.tip {
-    border-top: 3px solid #9999EE;
-    border-bottom: 1px solid #9999EE;
     background: #efefef url('/images/dialog-information.png') left center no-repeat;
 }
+.docs div.tip:before {
+    border-color:#99e;
+}
 
 .docs div.warning h1{
     font-size: 1.4em;
@@ -144,34 +170,47 @@ aside#quicktoc {
 .docs .refentry .methodsynopsis {
     color: #666;
     font-family: monospace;
-    font-size:1.167em; /* bumps it back up to the rest of the fonts because monospace is smaller */
+    font-size:1.230769em; /* bumps it back up to the rest of the fonts because monospace is smaller */
 }
 
 /* {{{ Parameter listing */
 .docs .refentry .parameters dl {
-    margin-top: -10px;
-    margin-bottom: -10px;
+    margin-bottom:0;
 }
-.docs .refentry .parameters dt {
-    font-size: 1.167em;
+
+.docs .refentry .parameters dl dd + dt {
+    margin-top:1.5em;
+}
+
+.docs .refentry .parameters dl dt code.parameter {
+    font-size:1.23076em;
+}
+.docs .refentry .parameters dl,
+.docs .refsect1.examples .title + p.para + * {
+    margin-top:-4.5em; /* there's a p tag that has whitespace (not :empty). This simply covers it up */
+}
+.docs .refsect1.returnvalues .title + p.para {
+    margin-top:0;
 }
 /* }}} */
 
 
 
 /* {{{ Examples (highlighting is in theme.css) */
-/*.docs blockquote.note,
-.docs div.caution,
-.docs div.tip
-.docs .example-contents div pre,*/
-.docs .example-contents div.phpcode,
+.docs .example-contents .phpcode code,
+.docs .refentry .methodsynopsis,
 .docs .example-contents.screen,
-.docs .refentry .methodsynopsis  {
-    border: 1px solid #CCCCCC;
+.docs .refentry .methodsynopsis {
+    border: 1px solid #ccc;
     background-color: #fff;
-    margin: 2px 0px;
-    font-weight: normal;
-    padding: .5em;
+    padding: 1.5em;
+}
+.docs .example-contents .phpcode code {
+    font-size:.923em;
+    line-height: 2;
+    display: block;
+    margin:-1px 0;
+    padding:2em;
 }
 
 /* }}} */
@@ -235,11 +274,6 @@ dl.qandaentry {
 }
 /* }}} */
 
-.docs div.refnamediv {
-    border-bottom: 3px solid #81939f;
-    position: relative;
-}
-
 .docs div.sect1, .docs div.partintro {
     position: relative;
 }
@@ -251,43 +285,42 @@ dl.qandaentry {
     color: #999;
 }
 
-.docs h1.refname {
-    font-size: 1.334em;
-    line-height: 1.049em;
-    margin-bottom:1.4em;
-    color:#444;
-    font-weight:bold;
-}
-
+.docs h1.refname,
 .docs p.refpurpose {
-    color: #454e55;
+    color: #444;
 }
 
-.docs  div.refsect1 h3.title {
-    border: 0;
-    color: #454e55;
+.docs div.refsect1 h3.title {
+    color: #444;
     position: absolute;
-    padding: 0;
-    margin:0;
-    line-height: 1em;
-    top:-1.4em;
+    top:-2em;
     left: 0;
-    font-size: 1.4em;
 }
 
-.docs div.refsect1 {
-    margin-top: 50px;
-    color: #454e55;
+.docs .refsect1 {
+    margin-top: 4.5em;
+    color: #444;
+}
+
+.docs .refsect1 > p:last-child,
+.docs .refsect1 > .warning:last-child,
+.docs .refsect1 > .tip:last-child {
+    margin-bottom:0;
 }
 
 .docs .classsynopsis,
 .docs div.refsect1 {
     position: relative;
     background-color: #f5f5f5;
-    border: 1px solid #cacaca;
-    padding: 10px;
+    padding: 1.5em .75em;
 }
 
+.docs .classsynopsis:before,
+.docs div.refsect1:before {
+    top:-.25em;
+    border-top: .25em solid #cacaca;
+    z-index: -1;
+}
 .docs .classsynopsis {
     color: #454e55;
 }
@@ -342,51 +375,50 @@ dl.qandaentry {
 }
 
 .docs .layout-menu ul.parent-menu-list li {
-    padding: 3px 6px;
-    margin: 3px 0;
+    padding: 0 .5em;
+    margin: 1.5em 0;
 }
 
+.docs .layout-menu ul.parent-menu-list > li:first-child {
+    margin-top:0;
+}
 .docs .layout-menu ul.parent-menu-list a {
-    font-size: 14px;
-    line-height: 1.5;
     color: #444;
     margin: 0;
-    padding: 3px 7px;
+    padding:0 .5em;
     border: 0;
-    border-left: 6px solid #7F7FB2;
+    border-left: .25em solid #7F7FB2;
 }
 
 .docs .layout-menu ul.parent-menu-list a:hover,
 .docs .layout-menu ul.parent-menu-list li:last-child a {
     color: #000;
-    border-left: 6px solid #666699;
+    border-left: .25em solid #666699;
 }
 
 .docs .layout-menu ul.child-menu-list {
     margin: 0;
-    padding: 10px 5px 10px 12px;
-    border-top: 3px solid #fff;
+    padding:1.5em 0 1.5em .25em;
     border: 0;
 }
 
 .docs .layout-menu ul.child-menu-list li {
-    font-size: 14px;
     list-style-type: none;
-    margin: 0;
-    padding: 4px 8px;
+    margin: 0 .5em -1px;
+    padding:0;
     border: 0;
     border-bottom: 1px dotted #aaa;
-    background-color: transparent;
 }
 
 .docs .layout-menu ul.child-menu-list a {
-    font-size: 13px;
-    border: 0;
+    font-size: .75em;
+    line-height: 2;
     color: black;
-    line-height: 1;
     overflow: visible;
-    margin: 0;
-    padding: 0;
+}
+
+.docs .layout-menu ul.child-menu-list .current a:before {
+    content:"\bb \20";
 }
 
 .docs .layout-menu ul.child-menu-list a:hover,
diff --git a/styles/home.css b/styles/home.css
index 4ccc92ca8..908d82c6f 100644
--- a/styles/home.css
+++ b/styles/home.css
@@ -6,19 +6,20 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    CCDA99
 
 #mega-drop-down div.what-is-php {
     color: #eee;
-    font-size: 1.334em;
-    line-height: 1.573em;
+    font-size: 1.125em;
+    line-height: 1.333em;
     width: 500px;
     float: left;
-    padding:1em 0 0;
 }
 
-#mega-drop-down .what-is-php p {
-    margin-bottom: 1em;
+#mega-drop-down div.what-is-php p {
+    margin:1.333em 0;
 }
-
 #mega-drop-down .what-is-php .tutorial {
     text-align: center;
+    font-size: 1.111em;
+    line-height: 1.2;
+    margin:1.2em 0;
 }
 #mega-drop-down .what-is-php .tutorial a {
     background: #669;
@@ -28,7 +29,8 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    CCDA99
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-    padding: 0 2em .1em;
+    padding: .6em 1.2em;
+    margin-bottom:-3px;
     display: block;
     border: 1px solid rgba(0,0,0,.9);
     border-bottom-width:3px;
@@ -48,33 +50,23 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    CCDA99
     border-bottom-width:1px;
     margin-top:2px;
 }
-#mega-drop-down .what-is-php .tutorial a:hover,
-#mega-drop-down .what-is-php .tutorial a:focus,
-#mega-drop-down .what-is-php .tutorial a:hover:active {
-}
 
 #mega-drop-down div.download {
     color: #eee;
     width: 300px;
     display: block;
     float: right;
-    margin: 5px 20px 10px 0;
-    padding: 10px;
-    font-size: 11px;
 }
 
 #mega-drop-down div.download h2 {
-    font-size: 1.4em;
+    font-size:1em;
+    line-height: 3;
     color: #ddd;
     text-align: center;
-    letter-spacing: 2px;
-    word-spacing: 4px;
-    line-height: 1.0em;
+    letter-spacing: .2em;
+    word-spacing: .4em;
     text-transform: uppercase;
-    font-weight: normal;
     text-shadow: #000 -1px -1px 1px;
-    margin: 0;
-    padding: 5px 0 10px 0;
 }
 
 
@@ -94,27 +86,21 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    CCDA99
 }
 
 #mega-drop-down div.download li:first-child {
-    padding: 15px 0 15px 120px;
-    background-image: url('/images/sprites.png');
-    background-position: 30px -195px;
-    background-repeat: no-repeat;
+    padding: 1em 0 1em 120px;
+    background: url('/images/sprites.png') no-repeat 10px -195px;
     margin-top: 0;
 }
 
-#mega-drop-down div.download li:first-child a:first-child {
-    font-size: 2em;
-}
-
 #mega-drop-down div.download li {
     color: #eee;
     display: block;
-    padding: 15px 0 0 120px;
-    background-image: url('/images/sprites.png');
-    background-position: 44px -280px;
-    background-repeat: no-repeat;
+    padding: 1em 0 0 120px;
+    background: url('/images/sprites.png') no-repeat 24px -273px;
     cursor: pointer;
     border-top: 1px solid #555;
     margin: 0;
+    font-size:.75em;
+    line-height: 1;
 }
 
 #mega-drop-down div.download a {
@@ -122,17 +108,18 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    CCDA99
     padding-left: 0;
     display: block;
     clear: right;
-    font-size: 1.0em;
-    line-height: 90%;
     font-weight: normal;
-    border-bottom: none;
 }
-
+#mega-drop-down div.download  li:first-child a:first-child {
+    font-size: 1.5em;
+    line-height: 1;
+}
 #mega-drop-down div.download a:first-child {
-    font-size: 1.6em;
+    font-size: 1.25em;
+    line-height: 1.2;
     font-weight: bold;
-    color: #FFF;
-    line-height: 120%;
+    color: #fff;
+    text-shadow:0 .1em .1em rgba(0,0,0,.666);
 }
 
 #head-beta-warning {
@@ -208,21 +195,14 @@ div.home-content {
     display: table;
     width: 100%;
     background-color: #bfbfff;
-    padding: 15px;
+    padding: 1.5em;
     text-align: center;
     margin: 0 auto;
-    font-size: 1.2em;
     list-style: none;
 }
-
-.home .announcements .category {
-    padding: 1em 0.5em 0;
+.home .announcements li + li {
+    margin-top:1.5em;
 }
-
-.home .announcements > li:first-child .category {
-    padding-top: 0;
-}
-
 .home .announcements ul, .home .announcements ul li {
     list-style: none;
     margin: 0;
@@ -231,20 +211,19 @@ div.home-content {
 }
 
 /* 2x2 Featured Content Grid */
-
+div.featured-content div.top-left,
+div.featured-content div.top-right {
+    margin-top:-1.5em;
+}
 div.featured-content div.feature {
     float: left;
     width: 270px;
     padding:0 20px;
     text-align: center;
 }
-div.featured-content div.top-left,
-div.featured-content div.top-right {
-    margin-top:-24px; /* This aligns the top of the images with the sidebar */
-}
 div.featured-content div.bottom-left,
 div.featured-content div.bottom-right {
-    padding-top:5px;
+    padding-top:1.5em;
 }
 
 div.featured-content span.graphic {
@@ -252,15 +231,16 @@ div.featured-content span.graphic {
     width: 128px;
     height: 128px;
     margin:0 auto;
+    padding:8px 0;
     background-image: url('../images/home-sprites.png');
 }
 
 div.featured-content div.top-left span.graphic {
-    background-position: 0 0;
+    background-position: 0 8px;
 }
 
 div.featured-content div.top-right span.graphic {
-    background-position: 0px -129px;
+    background-position: 0px -121px;
 }
 
 div.featured-content div.bottom-left span.graphic {
@@ -272,8 +252,13 @@ div.featured-content div.bottom-right span.graphic {
 }
 
 .featured-content .feature h3 {
-    padding-bottom: .5em;
     text-align: center;
+    color:#000;
+    font-weight:bold;
+}
+.featured-content .feature p {
+    margin:1.5em 0 0;
+    color:#333;
 }
 
 /* Right-hand sidebar */
@@ -286,10 +271,9 @@ div.home-sidebar {
 }
 
 div.home-sidebar h3 {
-    border-bottom: 6px solid #99c;
-    font-weight: normal;
-    margin: 1em 0 .5em;
-    padding:.25em 0;
+    border-bottom: .25em solid #99c;
+    margin: 1.2em 0 .95em;
+    padding:0;
 }
 
 div.home-sidebar h3:first-child {
@@ -314,28 +298,14 @@ div.home-sidebar a:hover {
     position: relative;
     margin-top:3em;
 }
-.home-content .recentNewsEntries h1 {
-    color:#000;
-}
-.home-content a.newsArchiveLink {
-    position: absolute;
-    top:.5em;
-    right:0;
-    font-style:italic;
-    border-bottom: 1px solid transparent;
-    color:#666;
-}
-.home-content a.newsArchiveLink:hover,
-.home-content a.newsArchiveLink:focus {
-    border-bottom: 1px solid #666;
-}
 
 .clear-left {
     clear:left
 }
 .home-content .separator {
     clear: left;
-    height:3px;
+    height:.25em;
     margin-top:3em;
+    margin-bottom:-.25em;
     background:#669;
 }
\ No newline at end of file
diff --git a/styles/theme.css b/styles/theme.css
index 8a5184425..ca517dd63 100755
--- a/styles/theme.css
+++ b/styles/theme.css
@@ -24,38 +24,35 @@ input {
 }
 
 body {
-    font-size: 0.9em;
-    line-height: 1.4em;
+    font-size: 1em;
+    line-height: 1.5em;
     background: url('/images/sprites.png') repeat-x 0px -990px #fff;
 }
 h1 {
-    font-size: 2.374em;
-    line-height: 1.179em;
-    margin:0;
+    font-size: 2em;
+    line-height: 1.5em;
 }
 h2 {
-    font-size: 1.78em;
-    line-height: 1.573em;
-    margin:0;
+    font-size: 1.5em;
+    line-height: 2em;
 }
 h3 {
-    font-size: 1.334em;
-    line-height: 1.049em;
-    margin: 0;
+    font-size: 1.25em;
+    line-height: 1.2em;
 }
 p, ul {
-    margin-top: 0;
-    margin-bottom: 1.4em;
+    margin:1.5em 0;
 }
-p:last-child {
-    margin-bottom: 0;
+p:empty {
+    margin:0;
+    height:0;
+    display:none;
 }
 small {
     font-size: 0.75em;
 }
 
 h1, h1 a, h1 a:visited, h1 a:link {
-    font-weight: normal;
     color: #666;
     border-color:#666;
 }
@@ -66,7 +63,6 @@ h1 a:focus {
 }
 
 h2, h2 a, h2 a:visited, h2 a:link {
-    font-weight: normal;
     color: #222;
     border-color:#222;
 }
@@ -79,14 +75,16 @@ h2 a:focus {
 
 h3.title {
     font-size: 1.5em;
-    border-top: 3px solid;
-    padding-top: 6px;
-    margin-top: 2em;
+    line-height: 2;
 }
 
-h4    { font-size: 1.3em;}
-h5    { font-size: 1.2em;}
-h6    { font-size: 1.1em;}
+h1, h2, h3, h4, h5, h6 {
+    font-weight:normal;
+}
+h4, h5, h6 {
+    font-size:1em;
+    color:#000;
+}
 
 
 a:link,
@@ -107,7 +105,7 @@ ul {
 
 #headnav {
     padding: 0 25px;
-    height: 72px;
+    height: 70px;
     line-height: 1;
     background: url('/images/sprites.png') repeat-x 0px -100px;
 }
@@ -138,8 +136,8 @@ ul {
 #headnav #headhome a.menu-link,
 #headnav #headhome a.menu-link:hover {
     background: url(/images/sprites.png) 0 0;
-    width: 170px;
-    height: 14px;
+    width: 130px;
+    height: 16px;
     text-indent: -2000em;
 }
 
@@ -160,7 +158,7 @@ ul {
     display: block;
     padding: 12px 15px 16px 15px;
     margin: 0;
-    border-bottom: 12px solid;
+    border-bottom: .5em solid;
     color: #444;
     border-color: #7F7FB2;
     font-weight: bold;
@@ -337,8 +335,7 @@ ul {
 }
 
 #usernotes h3 {
-    border-color: #669;
-    padding:.8em 20px .5em 0;
+    border-top: 3px solid #669;
 }
 
 #usernotes .note {
@@ -363,22 +360,20 @@ ul {
 
 /* Definition lists used on eg. the unsub page */
 dl dd {
-	margin: 0.5em 0 0.5em 2em;
-	padding: 0.5em;
+	margin:0;
+	padding:0 1.5em;
 }
 dl dd p {
-    margin-bottom:0;
-    padding:0;
+    margin:0;
 }
 
 
 /* PHP source code highlighting ------------------------------------------- */
 code {
     font-family: monospace;
-    font-size:1.167em; /* bumps it back up to the rest of the fonts because monospace is smaller */
+    font-size:1.230769em; /* bumps it back up to the rest of the fonts because monospace is smaller */
 }
 .phpcode, div.classsynopsis {
-	padding: 0.5em;
 	text-align: left;
 }
 div.phpcode span.html {
@@ -431,7 +426,7 @@ pre.info {
 }
 
 #mega-drop-down div.children {
-    border-bottom-width: 12px;
+    border-bottom-width: .5em;
     border-bottom-style: solid;
     padding-bottom: 1em;
 }
@@ -711,10 +706,11 @@ table.standard td {
 }
 
 .newsItem {
-    margin:2em 0;
+    margin:1.5em 0;
 }
 .newsItem .published {
     display:block;
-    margin:.5em 0;
     color:#666;
+    font-size:.75em;
+    line-height: 2;
 }
\ No newline at end of file