diff --git a/pep.css b/pep.css
index a82045bc9..a687ee8c8 100644
--- a/pep.css
+++ b/pep.css
@@ -8,11 +8,17 @@
 Default cascading style sheet for the PEP HTML output of Docutils.
 */
 
+/* "! important" is used here to override other ``margin-top`` and
+   ``margin-bottom`` styles that are later in the stylesheet or 
+   more specific.  See http://www.w3.org/TR/CSS1#the-cascade */
 .first {
-  margin-top: 0 }
+  margin-top: 0 ! important }
 
-.last {
-  margin-bottom: 0 }
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
 
 .navigation {
   width: 100% ;
@@ -53,12 +59,15 @@ a.toc-backref {
   text-decoration: none ;
   color: black }
 
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
 body {
   margin: 0px ;
   margin-bottom: 1em ;
   padding: 0px }
 
-dd {
+dl.docutils dd {
   margin-bottom: 0.5em }
 
 div.section {
@@ -78,12 +87,18 @@ div.abstract p.topic-title {
   font-weight: bold ;
   text-align: center }
 
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning {
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
   margin: 2em ;
   border: medium outset ;
   padding: 1em }
 
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
 div.attention p.admonition-title, div.caution p.admonition-title,
 div.danger p.admonition-title, div.error p.admonition-title,
 div.warning p.admonition-title {
@@ -91,21 +106,58 @@ div.warning p.admonition-title {
   font-weight: bold ;
   font-family: sans-serif }
 
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title {
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
   font-weight: bold ;
-  font-family: sans-serif }
+  font-style: normal }
 
 div.figure {
   margin-left: 2em }
 
 div.footer, div.header {
+  clear: both;
   font-size: smaller }
 
 div.footer {
   margin-left: 1em ;
   margin-right: 1em }
 
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin-left: 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
 div.system-messages {
   margin: 5em }
 
@@ -123,6 +175,10 @@ div.system-message p.system-message-title {
 div.topic {
   margin: 2em }
 
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
 h1 {
   font-family: sans-serif ;
   font-size: large }
@@ -149,9 +205,18 @@ h6 {
   font-style: italic ;
   font-size: x-small }
 
-.section hr {
+hr.docutils {
   width: 75% }
 
+img.align-left {
+  clear: left }
+
+img.align-right {
+  clear: right }
+
+img.borderless {
+  border: 0 }
+
 ol.simple, ul.simple {
   margin-bottom: 1em }
 
@@ -170,6 +235,10 @@ ol.lowerroman {
 ol.upperroman {
   list-style: upper-roman }
 
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
 p.caption {
   font-style: italic }
 
@@ -180,10 +249,31 @@ p.credits {
 p.label {
   white-space: nowrap }
 
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
 p.topic-title {
   font-family: sans-serif ;
   font-weight: bold }
 
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font-family: serif ;
+  font-size: 100% }
+
 pre.line-block {
   font-family: serif ;
   font-size: 100% }
@@ -204,6 +294,9 @@ span.classifier-delimiter {
 span.interpreted {
   font-family: sans-serif }
 
+span.option {
+  white-space: nowrap }
+
 span.option-argument {
   font-style: italic }
 
@@ -213,11 +306,25 @@ span.pre {
 span.problematic {
   color: red }
 
-table {
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid thin gray }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
   margin-top: 0.5em ;
   margin-bottom: 0.5em }
 
-td, th {
+table.footnote {
+  border-left: solid thin black }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
   padding-left: 0.5em ;
   padding-right: 0.5em ;
   vertical-align: top }
@@ -228,12 +335,14 @@ td.num {
 th.field-name {
   font-weight: bold ;
   text-align: left ;
-  white-space: nowrap }
+  white-space: nowrap ;
+  padding-left: 0 }
 
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
   font-size: 100% }
 
-tt {
+tt.docutils {
   background-color: #eeeeee }
 
 ul.auto-toc {