diff --git a/inst/examples/ex-bank_slopes.R b/inst/examples/ex-bank_slopes.R
index dd842955..f54c73dc 100644
--- a/inst/examples/ex-bank_slopes.R
+++ b/inst/examples/ex-bank_slopes.R
@@ -1,8 +1,4 @@
-### Name: bank_slopes
-### Title: Bank Slopes to 45 degrees
-### Aliases: bank_slopes
 
-### ** Examples
 
 library("ggplot2")
 # Use the classic sunspot data from Cleveland's original paper
diff --git a/inst/examples/ex-calc_pal.R b/inst/examples/ex-calc_pal.R
index 35ef909d..30f94e06 100644
--- a/inst/examples/ex-calc_pal.R
+++ b/inst/examples/ex-calc_pal.R
@@ -1,8 +1,4 @@
-### Name: calc_pal
-### Title: Calc color palette (discrete)
-### Aliases: calc_pal
 
-### ** Examples
 
 library(scales)
 show_col(calc_pal()(12))
diff --git a/inst/examples/ex-calc_shape_pal.R b/inst/examples/ex-calc_shape_pal.R
index 1522dcb3..82983a11 100644
--- a/inst/examples/ex-calc_shape_pal.R
+++ b/inst/examples/ex-calc_shape_pal.R
@@ -1,8 +1,4 @@
-### Name: calc_shape_pal
-### Title: Calc shape palette (discrete)
-### Aliases: calc_shape_pal
 
-### ** Examples
 
 library("ggplot2")
 show_shapes(calc_shape_pal()(15))
diff --git a/inst/examples/ex-circlefill_shape_pal.R b/inst/examples/ex-circlefill_shape_pal.R
index d330a4ca..40381b2a 100644
--- a/inst/examples/ex-circlefill_shape_pal.R
+++ b/inst/examples/ex-circlefill_shape_pal.R
@@ -1,8 +1,4 @@
-### Name: circlefill_shape_pal
-### Title: Filled Circle Shape palette (discrete)
-### Aliases: circlefill_shape_pal
 
-### ** Examples
 
 library("ggplot2")
 (ggplot(mtcars, aes(x=mpg, y=hp, shape=factor(cyl)))
diff --git a/inst/examples/ex-cleveland_shape_pal.R b/inst/examples/ex-cleveland_shape_pal.R
index a2b3efb0..718edffe 100644
--- a/inst/examples/ex-cleveland_shape_pal.R
+++ b/inst/examples/ex-cleveland_shape_pal.R
@@ -1,9 +1,5 @@
-### Name: cleveland_shape_pal
-### Title: Shape palette from Cleveland "Elements of Graphing Data"
 ###   (discrete).
-### Aliases: cleveland_shape_pal
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-colorblind.R b/inst/examples/ex-colorblind.R
index b23e310d..2ca3d518 100644
--- a/inst/examples/ex-colorblind.R
+++ b/inst/examples/ex-colorblind.R
@@ -1,9 +1,5 @@
-### Name: colorblind_pal
-### Title: Colorblind Color Palette (Discrete) and Scales
-### Aliases: colorblind_pal scale_colour_colorblind scale_color_colorblind
 ###   scale_fill_colorblind
 
-### ** Examples
 
 library("ggplot2")
 library(scales)
diff --git a/inst/examples/ex-economist_pal.R b/inst/examples/ex-economist_pal.R
index c4b9cf7a..1b94f63d 100644
--- a/inst/examples/ex-economist_pal.R
+++ b/inst/examples/ex-economist_pal.R
@@ -1,8 +1,4 @@
-### Name: economist_pal
-### Title: Economist color palette (discrete)
-### Aliases: economist_pal
 
-### ** Examples
 
 library(scales)
 show_col(economist_pal()(6))
diff --git a/inst/examples/ex-excel_pal.R b/inst/examples/ex-excel_pal.R
index 8ec08795..12724c1d 100644
--- a/inst/examples/ex-excel_pal.R
+++ b/inst/examples/ex-excel_pal.R
@@ -1,8 +1,4 @@
-### Name: excel_pal
-### Title: Excel color palette (discrete)
-### Aliases: excel_pal
 
-### ** Examples
 
 library("scales")
 show_col(excel_pal()(8))
diff --git a/inst/examples/ex-few_pal.R b/inst/examples/ex-few_pal.R
index 8c657dff..9fca9a22 100644
--- a/inst/examples/ex-few_pal.R
+++ b/inst/examples/ex-few_pal.R
@@ -1,9 +1,5 @@
-### Name: few_pal
-### Title: Color Palletes from Few's "Practical Rules for Using Color in
 ###   Charts"
-### Aliases: few_pal
 
-### ** Examples
 
 library("scales")
 show_col(few_pal()(7))
diff --git a/inst/examples/ex-fivethirtyeight_pal.R b/inst/examples/ex-fivethirtyeight_pal.R
index 4d5d9a69..3113600e 100644
--- a/inst/examples/ex-fivethirtyeight_pal.R
+++ b/inst/examples/ex-fivethirtyeight_pal.R
@@ -1,8 +1,4 @@
-### Name: fivethirtyeight_pal
-### Title: fivethirtyeight.com color palette
-### Aliases: fivethirtyeight_pal
 
-### ** Examples
 
 library("scales")
 show_col(fivethirtyeight_pal()(3))
diff --git a/inst/examples/ex-gdocs_pal.R b/inst/examples/ex-gdocs_pal.R
index 2e125d7d..1a2cd834 100644
--- a/inst/examples/ex-gdocs_pal.R
+++ b/inst/examples/ex-gdocs_pal.R
@@ -1,8 +1,4 @@
-### Name: gdocs_pal
-### Title: Google Docs color palette (discrete)
-### Aliases: gdocs_pal
 
-### ** Examples
 
 library("scales")
 show_col(gdocs_pal()(20))
diff --git a/inst/examples/ex-geom_rangeframe.R b/inst/examples/ex-geom_rangeframe.R
index ee81d8e7..062dffce 100644
--- a/inst/examples/ex-geom_rangeframe.R
+++ b/inst/examples/ex-geom_rangeframe.R
@@ -1,9 +1,5 @@
-### Name: geom_rangeframe
-### Title: Range Frames
-### Aliases: geom_rangeframe GeomRangeFrame
 ### Keywords: datasets
 
-### ** Examples
 
 library("ggplot2")
 ggplot(mtcars, aes(wt, mpg)) +
diff --git a/inst/examples/ex-geom_tufteboxplot.R b/inst/examples/ex-geom_tufteboxplot.R
index 90ccb8ff..25dd7e7b 100644
--- a/inst/examples/ex-geom_tufteboxplot.R
+++ b/inst/examples/ex-geom_tufteboxplot.R
@@ -1,9 +1,5 @@
-### Name: geom_tufteboxplot
-### Title: Tufte's Box Blot
-### Aliases: geom_tufteboxplot GeomTufteboxplot
 ### Keywords: datasets
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars, aes(factor(cyl), mpg))
diff --git a/inst/examples/ex-palette_pander.R b/inst/examples/ex-palette_pander.R
index df976597..c6b2be56 100644
--- a/inst/examples/ex-palette_pander.R
+++ b/inst/examples/ex-palette_pander.R
@@ -1,12 +1,8 @@
-### Name: palette_pander
-### Title: Color palette from the pander package
-### Aliases: palette_pander
 
-### ** Examples
 
-## Not run: 
-##D palette_pander(TRUE)
-## End(Not run)
+\dontrun{
+palette_pander(TRUE)
+}
 
 
 
diff --git a/inst/examples/ex-ptol_pal.R b/inst/examples/ex-ptol_pal.R
index 3d894656..4c6b1f24 100644
--- a/inst/examples/ex-ptol_pal.R
+++ b/inst/examples/ex-ptol_pal.R
@@ -1,8 +1,4 @@
-### Name: ptol_pal
-### Title: Color Palettes from Paul Tol's "Colour Schemes"
-### Aliases: ptol_pal
 
-### ** Examples
 
 library("scales")
 show_col(ptol_pal()(6))
diff --git a/inst/examples/ex-scale_color_tableau.R b/inst/examples/ex-scale_color_tableau.R
index 4253bf12..e0880e00 100644
--- a/inst/examples/ex-scale_color_tableau.R
+++ b/inst/examples/ex-scale_color_tableau.R
@@ -1,8 +1,4 @@
-### Name: scale_colour_tableau
-### Title: Tableau color scales.
-### Aliases: scale_colour_tableau scale_fill_tableau scale_color_tableau
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-scale_colour_gradient2_tableau.R b/inst/examples/ex-scale_colour_gradient2_tableau.R
index 384976d2..45d32f7b 100644
--- a/inst/examples/ex-scale_colour_gradient2_tableau.R
+++ b/inst/examples/ex-scale_colour_gradient2_tableau.R
@@ -1,9 +1,5 @@
-### Name: scale_colour_gradient2_tableau
-### Title: Tableau diverging colour scales (continuous)
-### Aliases: scale_colour_gradient2_tableau scale_fill_gradient2_tableau
 ###   scale_color_gradient2_tableau
 
-### ** Examples
 
 library("ggplot2")
 df <- data.frame(
diff --git a/inst/examples/ex-scale_colour_gradient_tableau.R b/inst/examples/ex-scale_colour_gradient_tableau.R
index f177d1ad..f7623f83 100644
--- a/inst/examples/ex-scale_colour_gradient_tableau.R
+++ b/inst/examples/ex-scale_colour_gradient_tableau.R
@@ -1,10 +1,6 @@
-### Name: scale_colour_gradient_tableau
-### Title: Tableau sequential colour scale (continuous)
-### Aliases: scale_colour_gradient_tableau scale_fill_gradient_tableau
 ###   scale_color_gradient_tableau scale_color_continuous_tableau
 ###   scale_fill_continuous_tableau
 
-### ** Examples
 
 #'
 library("ggplot2")
diff --git a/inst/examples/ex-scale_linetype_stata.R b/inst/examples/ex-scale_linetype_stata.R
index c2cfa61d..cbf330f1 100644
--- a/inst/examples/ex-scale_linetype_stata.R
+++ b/inst/examples/ex-scale_linetype_stata.R
@@ -1,8 +1,4 @@
-### Name: scale_linetype_stata
-### Title: Stata linetype palette (discrete)
-### Aliases: scale_linetype_stata
 
-### ** Examples
 
 library("tidyverse")
 rescale01 <- function(x) {(x - min(x)) / diff(range(x))}
diff --git a/inst/examples/ex-scale_shape_stata.R b/inst/examples/ex-scale_shape_stata.R
index 0f28428c..f6fc81c0 100644
--- a/inst/examples/ex-scale_shape_stata.R
+++ b/inst/examples/ex-scale_shape_stata.R
@@ -1,8 +1,4 @@
-### Name: scale_shape_stata
-### Title: Stata shape scale
-### Aliases: scale_shape_stata
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-scale_shape_tableau.R b/inst/examples/ex-scale_shape_tableau.R
index 3b8a6224..64f03c78 100644
--- a/inst/examples/ex-scale_shape_tableau.R
+++ b/inst/examples/ex-scale_shape_tableau.R
@@ -1,8 +1,4 @@
-### Name: scale_shape_tableau
-### Title: Tableau shape scales
-### Aliases: scale_shape_tableau
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-scale_shape_tremmel.R b/inst/examples/ex-scale_shape_tremmel.R
index 3627a4a0..0b596fc0 100644
--- a/inst/examples/ex-scale_shape_tremmel.R
+++ b/inst/examples/ex-scale_shape_tremmel.R
@@ -1,8 +1,4 @@
-### Name: scale_shape_tremmel
-### Title: Shape scales from Tremmel (1995)
-### Aliases: scale_shape_tremmel
 
-### ** Examples
 
 library("ggplot2")
 (ggplot(mtcars, aes(x=mpg, y=hp, shape=factor(cyl)))
diff --git a/inst/examples/ex-scale_solarized.R b/inst/examples/ex-scale_solarized.R
index 2de46820..0563f371 100644
--- a/inst/examples/ex-scale_solarized.R
+++ b/inst/examples/ex-scale_solarized.R
@@ -1,9 +1,5 @@
-### Name: scale_fill_solarized
-### Title: Solarized color scales
-### Aliases: scale_fill_solarized scale_colour_solarized
 ###   scale_color_solarized
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-show_linetypes.R b/inst/examples/ex-show_linetypes.R
index 96ea7d31..4cca5eb3 100644
--- a/inst/examples/ex-show_linetypes.R
+++ b/inst/examples/ex-show_linetypes.R
@@ -1,8 +1,4 @@
-### Name: show_linetypes
-### Title: Show linetypes
-### Aliases: show_linetypes
 
-### ** Examples
 
 library("scales")
 show_linetypes(linetype_pal()(3))
diff --git a/inst/examples/ex-show_shapes.R b/inst/examples/ex-show_shapes.R
index ed5554fe..013d2e28 100644
--- a/inst/examples/ex-show_shapes.R
+++ b/inst/examples/ex-show_shapes.R
@@ -1,8 +1,4 @@
-### Name: show_shapes
-### Title: Show shapes
-### Aliases: show_shapes
 
-### ** Examples
 
 library("scales")
 show_shapes(shape_pal()(5))
diff --git a/inst/examples/ex-solarized_pal.R b/inst/examples/ex-solarized_pal.R
index bdf184c8..3694b300 100644
--- a/inst/examples/ex-solarized_pal.R
+++ b/inst/examples/ex-solarized_pal.R
@@ -1,8 +1,4 @@
-### Name: solarized_pal
-### Title: Solarized color palette (discrete)
-### Aliases: solarized_pal
 
-### ** Examples
 
 library("scales")
 show_col(solarized_pal()(2))
diff --git a/inst/examples/ex-stata_pal.R b/inst/examples/ex-stata_pal.R
index f7b4ac50..cb5fe51e 100644
--- a/inst/examples/ex-stata_pal.R
+++ b/inst/examples/ex-stata_pal.R
@@ -1,8 +1,4 @@
-### Name: stata_pal
-### Title: Stata color palettes (discrete)
-### Aliases: stata_pal
 
-### ** Examples
 
 library("scales")
 show_col(stata_pal("s2color")(15))
diff --git a/inst/examples/ex-tableau_color_pal.R b/inst/examples/ex-tableau_color_pal.R
index f235c574..4b2c35f1 100644
--- a/inst/examples/ex-tableau_color_pal.R
+++ b/inst/examples/ex-tableau_color_pal.R
@@ -1,8 +1,4 @@
-### Name: tableau_color_pal
-### Title: Color Palettes based on Tableau (discrete)
-### Aliases: tableau_color_pal
 
-### ** Examples
 
 library("scales")
 show_col(tableau_color_pal('tableau20')(20))
diff --git a/inst/examples/ex-tableau_div_gradient_pal.R b/inst/examples/ex-tableau_div_gradient_pal.R
index 302dd944..f9dbbcc8 100644
--- a/inst/examples/ex-tableau_div_gradient_pal.R
+++ b/inst/examples/ex-tableau_div_gradient_pal.R
@@ -1,8 +1,4 @@
-### Name: tableau_div_gradient_pal
-### Title: Tableau diverging colour gradient palettes (continuous)
-### Aliases: tableau_div_gradient_pal
 
-### ** Examples
 
 x <- seq(-1, 1, length = 100)
 r <- sqrt(outer(x^2, x^2, '+'))
diff --git a/inst/examples/ex-tableau_seq_gradient_pal.R b/inst/examples/ex-tableau_seq_gradient_pal.R
index c1029500..6b744ce9 100644
--- a/inst/examples/ex-tableau_seq_gradient_pal.R
+++ b/inst/examples/ex-tableau_seq_gradient_pal.R
@@ -1,8 +1,4 @@
-### Name: tableau_seq_gradient_pal
-### Title: Tableau sequential colour gradient palettes (continuous)
-### Aliases: tableau_seq_gradient_pal
 
-### ** Examples
 
 library("scales")
 x <- seq(0, 1, length = 25)
diff --git a/inst/examples/ex-tableau_shape_pal.R b/inst/examples/ex-tableau_shape_pal.R
index 78964de2..f0081354 100644
--- a/inst/examples/ex-tableau_shape_pal.R
+++ b/inst/examples/ex-tableau_shape_pal.R
@@ -1,8 +1,4 @@
-### Name: tableau_shape_pal
-### Title: Tableau Shape Palettes (discrete)
-### Aliases: tableau_shape_pal
 
-### ** Examples
 
 show_shapes(tableau_shape_pal()(5))
 
diff --git a/inst/examples/ex-theme_base.R b/inst/examples/ex-theme_base.R
index 347254c5..40ca11ac 100644
--- a/inst/examples/ex-theme_base.R
+++ b/inst/examples/ex-theme_base.R
@@ -1,8 +1,4 @@
-### Name: theme_base
-### Title: Theme Base
-### Aliases: theme_base
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
diff --git a/inst/examples/ex-theme_calc.R b/inst/examples/ex-theme_calc.R
index ed834236..0b7fd132 100644
--- a/inst/examples/ex-theme_calc.R
+++ b/inst/examples/ex-theme_calc.R
@@ -1,8 +1,4 @@
-### Name: theme_calc
-### Title: Theme Calc
-### Aliases: theme_calc
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-theme_economist.R b/inst/examples/ex-theme_economist.R
index 4ba8b53c..3634f1c7 100644
--- a/inst/examples/ex-theme_economist.R
+++ b/inst/examples/ex-theme_economist.R
@@ -1,8 +1,4 @@
-### Name: theme_economist
-### Title: ggplot color theme based on the Economist
-### Aliases: theme_economist theme_economist_white
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
@@ -32,16 +28,16 @@ p + theme_economist_white() +
 ## All white variant
 p + theme_economist_white(gray_bg = FALSE) +
     scale_colour_economist()
-## Not run:
-##D ## The Economist uses ITC Officina Sans
-##D library(extrafont)
-##D p + theme_economist(base_family="ITC Officina Sans") +
-##D     scale_colour_economist()
+\dontrun{
+## The Economist uses ITC Officina Sans
+library(extrafont)
+p + theme_economist(base_family="ITC Officina Sans") +
+    scale_colour_economist()
 ##D
-##D ## Verdana is a widely available substitute
-##D p + theme_economist(base_family="Verdana") +
-##D     scale_colour_economist()
-## End(Not run)
+## Verdana is a widely available substitute
+p + theme_economist(base_family="Verdana") +
+    scale_colour_economist()
+}
 
 
 
diff --git a/inst/examples/ex-theme_excel.R b/inst/examples/ex-theme_excel.R
index 84ade4ec..4bdf55e7 100644
--- a/inst/examples/ex-theme_excel.R
+++ b/inst/examples/ex-theme_excel.R
@@ -1,8 +1,4 @@
-### Name: theme_excel
-### Title: ggplot color theme based on old Excel plots
-### Aliases: theme_excel
 
-### ** Examples
 
 library("ggplot2")
 # Old line color
diff --git a/inst/examples/ex-theme_few.R b/inst/examples/ex-theme_few.R
index f711e6bf..4557b2f8 100644
--- a/inst/examples/ex-theme_few.R
+++ b/inst/examples/ex-theme_few.R
@@ -1,8 +1,4 @@
-### Name: theme_few
-### Title: Theme based on Few's "Practical Rules for Using Color in Charts"
-### Aliases: theme_few
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
diff --git a/inst/examples/ex-theme_gdocs.R b/inst/examples/ex-theme_gdocs.R
index 51a5da9b..ed979196 100644
--- a/inst/examples/ex-theme_gdocs.R
+++ b/inst/examples/ex-theme_gdocs.R
@@ -1,8 +1,4 @@
-### Name: theme_gdocs
-### Title: Theme with Google Docs Chart defaults
-### Aliases: theme_gdocs
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-theme_hc.R b/inst/examples/ex-theme_hc.R
index 90950bc2..d1f3d741 100644
--- a/inst/examples/ex-theme_hc.R
+++ b/inst/examples/ex-theme_hc.R
@@ -1,8 +1,4 @@
-### Name: theme_hc
-### Title: Highcharts JS theme
-### Aliases: theme_hc
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
diff --git a/inst/examples/ex-theme_igray.R b/inst/examples/ex-theme_igray.R
index c13534cc..00e2920c 100644
--- a/inst/examples/ex-theme_igray.R
+++ b/inst/examples/ex-theme_igray.R
@@ -1,8 +1,4 @@
-### Name: theme_igray
-### Title: Inverse gray theme
-### Aliases: theme_igray
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-theme_map.R b/inst/examples/ex-theme_map.R
index 826c24f9..074107a7 100644
--- a/inst/examples/ex-theme_map.R
+++ b/inst/examples/ex-theme_map.R
@@ -1,8 +1,4 @@
-### Name: theme_map
-### Title: Clean theme for maps
-### Aliases: theme_map
 
-### ** Examples
 
 library("maps")
 library("ggplot2")
diff --git a/inst/examples/ex-theme_pander.R b/inst/examples/ex-theme_pander.R
index 93a16086..f12edda5 100644
--- a/inst/examples/ex-theme_pander.R
+++ b/inst/examples/ex-theme_pander.R
@@ -1,8 +1,4 @@
-### Name: theme_pander
-### Title: A ggplot theme originated from the pander package
-### Aliases: theme_pander
 
-### ** Examples
 
 library("ggplot2")
 library("pander")
diff --git a/inst/examples/ex-theme_par.R b/inst/examples/ex-theme_par.R
index 11dd03bb..d059cc64 100644
--- a/inst/examples/ex-theme_par.R
+++ b/inst/examples/ex-theme_par.R
@@ -1,9 +1,5 @@
-### Name: theme_par
-### Title: Theme which takes its values from the current 'base' graphics
 ###   parameter values in 'par'.
-### Aliases: theme_par
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
diff --git a/inst/examples/ex-theme_solarized.R b/inst/examples/ex-theme_solarized.R
index f423efe0..5c60f626 100644
--- a/inst/examples/ex-theme_solarized.R
+++ b/inst/examples/ex-theme_solarized.R
@@ -1,8 +1,4 @@
-### Name: theme_solarized
-### Title: ggplot color themes based on the Solarized palette
-### Aliases: theme_solarized theme_solarized_2
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-theme_solid.R b/inst/examples/ex-theme_solid.R
index 109bc4a7..8c6fb6db 100644
--- a/inst/examples/ex-theme_solid.R
+++ b/inst/examples/ex-theme_solid.R
@@ -1,8 +1,4 @@
-### Name: theme_solid
-### Title: Theme with nothing other than a background color
-### Aliases: theme_solid
 
-### ** Examples
 
 library("ggplot2")
 (ggplot(mtcars, aes(wt, mpg))
diff --git a/inst/examples/ex-theme_stata.R b/inst/examples/ex-theme_stata.R
index b5e0746a..0aab93f1 100644
--- a/inst/examples/ex-theme_stata.R
+++ b/inst/examples/ex-theme_stata.R
@@ -1,8 +1,4 @@
-### Name: theme_stata
-### Title: Themes based on Stata graph schemes
-### Aliases: theme_stata
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/inst/examples/ex-theme_tufte.R b/inst/examples/ex-theme_tufte.R
index 9d398a0e..c5cbd412 100644
--- a/inst/examples/ex-theme_tufte.R
+++ b/inst/examples/ex-theme_tufte.R
@@ -1,8 +1,4 @@
-### Name: theme_tufte
-### Title: Tufte Maximal Data, Minimal Ink Theme
-### Aliases: theme_tufte
 
-### ** Examples
 
 library("ggplot2")
 # with ticks and range frames
@@ -13,17 +9,17 @@ library("ggplot2")
 (ggplot(mtcars, aes(wt, mpg))
  + geom_point() + geom_rug()
  + theme_tufte(ticks=FALSE))
-## Not run: 
-##D ## Using the Bembo serif family
-##D library(extrafont)
-##D (ggplot(mtcars, aes(wt, mpg))
-##D  + geom_point() + geom_rangeframe()
-##D  + theme_tufte(base_family='BemboStd'))
-##D ## Using the Gill Sans sans serif family
-##D (ggplot(mtcars, aes(wt, mpg))
-##D  + geom_point() + geom_rangeframe()
-##D  + theme_tufte(base_family='GillSans'))
-## End(Not run)
+\dontrun{
+## Using the Bembo serif family
+library(extrafont)
+(ggplot(mtcars, aes(wt, mpg))
+ + geom_point() + geom_rangeframe()
+ + theme_tufte(base_family='BemboStd'))
+## Using the Gill Sans sans serif family
+(ggplot(mtcars, aes(wt, mpg))
+ + geom_point() + geom_rangeframe()
+ + theme_tufte(base_family='GillSans'))
+}
 
 
 
diff --git a/inst/examples/ex-theme_wsj.R b/inst/examples/ex-theme_wsj.R
index c7440513..86e9207f 100644
--- a/inst/examples/ex-theme_wsj.R
+++ b/inst/examples/ex-theme_wsj.R
@@ -1,8 +1,4 @@
-### Name: theme_wsj
-### Title: Wall Street Journal theme
-### Aliases: theme_wsj
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/bank_slopes.Rd b/man/bank_slopes.Rd
index 9a827a4e..7270f30d 100644
--- a/man/bank_slopes.Rd
+++ b/man/bank_slopes.Rd
@@ -80,11 +80,7 @@ requiring optimization.
 }
 
 \examples{
-### Name: bank_slopes
-### Title: Bank Slopes to 45 degrees
-### Aliases: bank_slopes
 
-### ** Examples
 
 library("ggplot2")
 # Use the classic sunspot data from Cleveland's original paper
diff --git a/man/calc_pal.Rd b/man/calc_pal.Rd
index 8ff22d99..f7bfdd87 100644
--- a/man/calc_pal.Rd
+++ b/man/calc_pal.Rd
@@ -10,11 +10,7 @@ calc_pal()
 Color palettes from LibreOffice Calc.
 }
 \examples{
-### Name: calc_pal
-### Title: Calc color palette (discrete)
-### Aliases: calc_pal
 
-### ** Examples
 
 library(scales)
 show_col(calc_pal()(12))
diff --git a/man/calc_shape_pal.Rd b/man/calc_shape_pal.Rd
index fae962f0..f40cbdb0 100644
--- a/man/calc_shape_pal.Rd
+++ b/man/calc_shape_pal.Rd
@@ -10,11 +10,7 @@ calc_shape_pal()
 Shape palette based on the shapes used in LibreOffice Calc.
 }
 \examples{
-### Name: calc_shape_pal
-### Title: Calc shape palette (discrete)
-### Aliases: calc_shape_pal
 
-### ** Examples
 
 library("ggplot2")
 show_shapes(calc_shape_pal()(15))
diff --git a/man/circlefill_shape_pal.Rd b/man/circlefill_shape_pal.Rd
index 80f7f736..23355c53 100644
--- a/man/circlefill_shape_pal.Rd
+++ b/man/circlefill_shape_pal.Rd
@@ -13,11 +13,7 @@ solid, hollow, half-filled, with two additional fill amounts:
 three-quarters, and one-quarter.
 }
 \examples{
-### Name: circlefill_shape_pal
-### Title: Filled Circle Shape palette (discrete)
-### Aliases: circlefill_shape_pal
 
-### ** Examples
 
 library("ggplot2")
 (ggplot(mtcars, aes(x=mpg, y=hp, shape=factor(cyl)))
diff --git a/man/cleveland_shape_pal.Rd b/man/cleveland_shape_pal.Rd
index 81076f2b..3248e78b 100644
--- a/man/cleveland_shape_pal.Rd
+++ b/man/cleveland_shape_pal.Rd
@@ -29,12 +29,8 @@ Following Tremmel (1995), I replace the circle with a vertical
 line with an encircled plus sign.
 }
 \examples{
-### Name: cleveland_shape_pal
-### Title: Shape palette from Cleveland "Elements of Graphing Data"
 ###   (discrete).
-### Aliases: cleveland_shape_pal
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/colorblind.Rd b/man/colorblind.Rd
index b03a9f20..84c371ab 100644
--- a/man/colorblind.Rd
+++ b/man/colorblind.Rd
@@ -23,12 +23,8 @@ to control name, limits, breaks, labels and so forth.}
 An 8-color colorblind safe qualitative discrete palette.
 }
 \examples{
-### Name: colorblind_pal
-### Title: Colorblind Color Palette (Discrete) and Scales
-### Aliases: colorblind_pal scale_colour_colorblind scale_color_colorblind
 ###   scale_fill_colorblind
 
-### ** Examples
 
 library("ggplot2")
 library(scales)
diff --git a/man/economist_pal.Rd b/man/economist_pal.Rd
index 1857e247..8dc00df3 100644
--- a/man/economist_pal.Rd
+++ b/man/economist_pal.Rd
@@ -17,11 +17,7 @@ included in these palettes and should be used to indicate
 important data.
 }
 \examples{
-### Name: economist_pal
-### Title: Economist color palette (discrete)
-### Aliases: economist_pal
 
-### ** Examples
 
 library(scales)
 show_col(economist_pal()(6))
diff --git a/man/excel_pal.Rd b/man/excel_pal.Rd
index f9b1efb5..be1d84a2 100644
--- a/man/excel_pal.Rd
+++ b/man/excel_pal.Rd
@@ -22,11 +22,7 @@ The color palettes are
 }
 }
 \examples{
-### Name: excel_pal
-### Title: Excel color palette (discrete)
-### Aliases: excel_pal
 
-### ** Examples
 
 library("scales")
 show_col(excel_pal()(8))
diff --git a/man/few_pal.Rd b/man/few_pal.Rd
index b6ca4a77..d2f05019 100644
--- a/man/few_pal.Rd
+++ b/man/few_pal.Rd
@@ -22,12 +22,8 @@ He suggests the following
 }
 }
 \examples{
-### Name: few_pal
-### Title: Color Palletes from Few's "Practical Rules for Using Color in
 ###   Charts"
-### Aliases: few_pal
 
-### ** Examples
 
 library("scales")
 show_col(few_pal()(7))
diff --git a/man/fivethirtyeight_pal.Rd b/man/fivethirtyeight_pal.Rd
index db04d05d..d0dad432 100644
--- a/man/fivethirtyeight_pal.Rd
+++ b/man/fivethirtyeight_pal.Rd
@@ -10,11 +10,7 @@ fivethirtyeight_pal()
 The standard fivethirtyeight.com palette for line plots is blue, red, green.
 }
 \examples{
-### Name: fivethirtyeight_pal
-### Title: fivethirtyeight.com color palette
-### Aliases: fivethirtyeight_pal
 
-### ** Examples
 
 library("scales")
 show_col(fivethirtyeight_pal()(3))
diff --git a/man/gdocs_pal.Rd b/man/gdocs_pal.Rd
index e4aa8beb..660886e8 100644
--- a/man/gdocs_pal.Rd
+++ b/man/gdocs_pal.Rd
@@ -10,11 +10,7 @@ gdocs_pal()
 Color palettes from Google Docs.
 }
 \examples{
-### Name: gdocs_pal
-### Title: Google Docs color palette (discrete)
-### Aliases: gdocs_pal
 
-### ** Examples
 
 library("scales")
 show_col(gdocs_pal()(20))
diff --git a/man/geom_rangeframe.Rd b/man/geom_rangeframe.Rd
index 0f449824..c0479766 100644
--- a/man/geom_rangeframe.Rd
+++ b/man/geom_rangeframe.Rd
@@ -71,12 +71,8 @@ Axis lines which extend to the maximum and minimum of the plotted data.
 }
 
 \examples{
-### Name: geom_rangeframe
-### Title: Range Frames
-### Aliases: geom_rangeframe GeomRangeFrame
 ### Keywords: datasets
 
-### ** Examples
 
 library("ggplot2")
 ggplot(mtcars, aes(wt, mpg)) +
diff --git a/man/geom_tufteboxplot.Rd b/man/geom_tufteboxplot.Rd
index 22e17e51..9f0b1d12 100644
--- a/man/geom_tufteboxplot.Rd
+++ b/man/geom_tufteboxplot.Rd
@@ -90,12 +90,8 @@ Edward Tufte's revisions of the box plot as described in
 }
 
 \examples{
-### Name: geom_tufteboxplot
-### Title: Tufte's Box Blot
-### Aliases: geom_tufteboxplot GeomTufteboxplot
 ### Keywords: datasets
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars, aes(factor(cyl), mpg))
diff --git a/man/palette_pander.Rd b/man/palette_pander.Rd
index ab1418db..a0160811 100644
--- a/man/palette_pander.Rd
+++ b/man/palette_pander.Rd
@@ -17,15 +17,11 @@ The \pkg{pander} ships with a default colorblind and printer-friendly
 color palette borrowed from \url{http://jfly.iam.u-tokyo.ac.jp/color/}.
 }
 \examples{
-### Name: palette_pander
-### Title: Color palette from the pander package
-### Aliases: palette_pander
 
-### ** Examples
 
-## Not run: 
-##D palette_pander(TRUE)
-## End(Not run)
+\dontrun{
+palette_pander(TRUE)
+}
 
 
 
diff --git a/man/ptol_pal.Rd b/man/ptol_pal.Rd
index 0f802aee..0cfee247 100644
--- a/man/ptol_pal.Rd
+++ b/man/ptol_pal.Rd
@@ -15,11 +15,7 @@ Incorporation of the palette into an R package was originally inspired by
 Peter Carl's [Paul Tol 21 Gun Salute](https://tradeblotter.wordpress.com/2013/02/28/the-paul-tol-21-color-salute/)
 }
 \examples{
-### Name: ptol_pal
-### Title: Color Palettes from Paul Tol's "Colour Schemes"
-### Aliases: ptol_pal
 
-### ** Examples
 
 library("scales")
 show_col(ptol_pal()(6))
diff --git a/man/scale_color_tableau.Rd b/man/scale_color_tableau.Rd
index 51b63afc..4bc67299 100644
--- a/man/scale_color_tableau.Rd
+++ b/man/scale_color_tableau.Rd
@@ -22,11 +22,7 @@ to control name, limits, breaks, labels and so forth.}
 See \code{\link{tableau_color_pal}} for details.
 }
 \examples{
-### Name: scale_colour_tableau
-### Title: Tableau color scales.
-### Aliases: scale_colour_tableau scale_fill_tableau scale_color_tableau
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/scale_colour_gradient2_tableau.Rd b/man/scale_colour_gradient2_tableau.Rd
index 5d522fdb..5e0ff19c 100644
--- a/man/scale_colour_gradient2_tableau.Rd
+++ b/man/scale_colour_gradient2_tableau.Rd
@@ -32,12 +32,8 @@ colour bar, or \code{'legend'} for discrete colour legend.}
 Tableau diverging colour scales (continuous)
 }
 \examples{
-### Name: scale_colour_gradient2_tableau
-### Title: Tableau diverging colour scales (continuous)
-### Aliases: scale_colour_gradient2_tableau scale_fill_gradient2_tableau
 ###   scale_color_gradient2_tableau
 
-### ** Examples
 
 library("ggplot2")
 df <- data.frame(
diff --git a/man/scale_colour_gradient_tableau.Rd b/man/scale_colour_gradient_tableau.Rd
index 22833c40..f2442d84 100644
--- a/man/scale_colour_gradient_tableau.Rd
+++ b/man/scale_colour_gradient_tableau.Rd
@@ -40,13 +40,9 @@ colour bar, or \code{'legend'} for discrete colour legend.}
 Tableau sequential colour scale (continuous)
 }
 \examples{
-### Name: scale_colour_gradient_tableau
-### Title: Tableau sequential colour scale (continuous)
-### Aliases: scale_colour_gradient_tableau scale_fill_gradient_tableau
 ###   scale_color_gradient_tableau scale_color_continuous_tableau
 ###   scale_fill_continuous_tableau
 
-### ** Examples
 
 #'
 library("ggplot2")
diff --git a/man/scale_linetype_stata.Rd b/man/scale_linetype_stata.Rd
index c54c64ca..759a11e4 100644
--- a/man/scale_linetype_stata.Rd
+++ b/man/scale_linetype_stata.Rd
@@ -15,11 +15,7 @@ scale_linetype_stata(...)
 See \code{\link{stata_linetype_pal}} for details.
 }
 \examples{
-### Name: scale_linetype_stata
-### Title: Stata linetype palette (discrete)
-### Aliases: scale_linetype_stata
 
-### ** Examples
 
 library("tidyverse")
 rescale01 <- function(x) {(x - min(x)) / diff(range(x))}
diff --git a/man/scale_shape_stata.Rd b/man/scale_shape_stata.Rd
index 61c3fbbe..f64981b8 100644
--- a/man/scale_shape_stata.Rd
+++ b/man/scale_shape_stata.Rd
@@ -15,11 +15,7 @@ scale_shape_stata(...)
 See \code{\link{stata_shape_pal}} for details.
 }
 \examples{
-### Name: scale_shape_stata
-### Title: Stata shape scale
-### Aliases: scale_shape_stata
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/scale_shape_tableau.Rd b/man/scale_shape_tableau.Rd
index f6687cfd..96427584 100644
--- a/man/scale_shape_tableau.Rd
+++ b/man/scale_shape_tableau.Rd
@@ -17,11 +17,7 @@ scale_shape_tableau(palette = "default", ...)
 See \code{\link{tableau_shape_pal}} for details.
 }
 \examples{
-### Name: scale_shape_tableau
-### Title: Tableau shape scales
-### Aliases: scale_shape_tableau
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/scale_shape_tremmel.Rd b/man/scale_shape_tremmel.Rd
index a235a742..849f9d87 100644
--- a/man/scale_shape_tremmel.Rd
+++ b/man/scale_shape_tremmel.Rd
@@ -22,11 +22,7 @@ triangle.}
 Shape scales from Tremmel (1995)
 }
 \examples{
-### Name: scale_shape_tremmel
-### Title: Shape scales from Tremmel (1995)
-### Aliases: scale_shape_tremmel
 
-### ** Examples
 
 library("ggplot2")
 (ggplot(mtcars, aes(x=mpg, y=hp, shape=factor(cyl)))
diff --git a/man/scale_solarized.Rd b/man/scale_solarized.Rd
index f34b852d..ead6f116 100644
--- a/man/scale_solarized.Rd
+++ b/man/scale_solarized.Rd
@@ -22,12 +22,8 @@ to control name, limits, breaks, labels and so forth.}
 See \code{\link{solarized_pal}} for details.
 }
 \examples{
-### Name: scale_fill_solarized
-### Title: Solarized color scales
-### Aliases: scale_fill_solarized scale_colour_solarized
 ###   scale_color_solarized
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/show_linetypes.Rd b/man/show_linetypes.Rd
index ac112770..0bdc281e 100644
--- a/man/show_linetypes.Rd
+++ b/man/show_linetypes.Rd
@@ -16,11 +16,7 @@ show_linetypes(linetypes, labels = TRUE)
 A quick and dirty way to show linetypes.
 }
 \examples{
-### Name: show_linetypes
-### Title: Show linetypes
-### Aliases: show_linetypes
 
-### ** Examples
 
 library("scales")
 show_linetypes(linetype_pal()(3))
diff --git a/man/show_shapes.Rd b/man/show_shapes.Rd
index 2da01fd1..a6d54d5d 100644
--- a/man/show_shapes.Rd
+++ b/man/show_shapes.Rd
@@ -16,11 +16,7 @@ show_shapes(shapes, labels = TRUE)
 A quick and dirty way to show shapes.
 }
 \examples{
-### Name: show_shapes
-### Title: Show shapes
-### Aliases: show_shapes
 
-### ** Examples
 
 library("scales")
 show_shapes(shape_pal()(5))
diff --git a/man/solarized_pal.Rd b/man/solarized_pal.Rd
index 8603563f..f0be8847 100644
--- a/man/solarized_pal.Rd
+++ b/man/solarized_pal.Rd
@@ -19,11 +19,7 @@ the other colors are the combination of colors that maximizes the
 total Euclidean distance between colors in L*a*b space.
 }
 \examples{
-### Name: solarized_pal
-### Title: Solarized color palette (discrete)
-### Aliases: solarized_pal
 
-### ** Examples
 
 library("scales")
 show_col(solarized_pal()(2))
diff --git a/man/stata_pal.Rd b/man/stata_pal.Rd
index 4970ea23..f8db4f11 100644
--- a/man/stata_pal.Rd
+++ b/man/stata_pal.Rd
@@ -15,11 +15,7 @@ Stata color palettes. See Stata documentation for a description of
 the schemes, \url{http://www.stata.com/help.cgi?schemes}.
 }
 \examples{
-### Name: stata_pal
-### Title: Stata color palettes (discrete)
-### Aliases: stata_pal
 
-### ** Examples
 
 library("scales")
 show_col(stata_pal("s2color")(15))
diff --git a/man/tableau_color_pal.Rd b/man/tableau_color_pal.Rd
index 2d28ba9a..3f803261 100644
--- a/man/tableau_color_pal.Rd
+++ b/man/tableau_color_pal.Rd
@@ -14,11 +14,7 @@ Color palettes used in
 \href{http://www.tableausoftware.com/}{Tableau}.
 }
 \examples{
-### Name: tableau_color_pal
-### Title: Color Palettes based on Tableau (discrete)
-### Aliases: tableau_color_pal
 
-### ** Examples
 
 library("scales")
 show_col(tableau_color_pal('tableau20')(20))
diff --git a/man/tableau_div_gradient_pal.Rd b/man/tableau_div_gradient_pal.Rd
index e378a303..31763bd1 100644
--- a/man/tableau_div_gradient_pal.Rd
+++ b/man/tableau_div_gradient_pal.Rd
@@ -15,11 +15,7 @@ tableau_div_gradient_pal(palette = "Red-Blue", space = "Lab")
 Tableau diverging colour gradient palettes (continuous)
 }
 \examples{
-### Name: tableau_div_gradient_pal
-### Title: Tableau diverging colour gradient palettes (continuous)
-### Aliases: tableau_div_gradient_pal
 
-### ** Examples
 
 x <- seq(-1, 1, length = 100)
 r <- sqrt(outer(x^2, x^2, '+'))
diff --git a/man/tableau_seq_gradient_pal.Rd b/man/tableau_seq_gradient_pal.Rd
index 11e06067..49e35683 100644
--- a/man/tableau_seq_gradient_pal.Rd
+++ b/man/tableau_seq_gradient_pal.Rd
@@ -15,11 +15,7 @@ tableau_seq_gradient_pal(palette = "Red", space = "Lab")
 Tableau sequential colour gradient palettes (continuous)
 }
 \examples{
-### Name: tableau_seq_gradient_pal
-### Title: Tableau sequential colour gradient palettes (continuous)
-### Aliases: tableau_seq_gradient_pal
 
-### ** Examples
 
 library("scales")
 x <- seq(0, 1, length = 25)
diff --git a/man/tableau_shape_pal.Rd b/man/tableau_shape_pal.Rd
index f1affae6..38e87684 100644
--- a/man/tableau_shape_pal.Rd
+++ b/man/tableau_shape_pal.Rd
@@ -14,11 +14,7 @@ Shape palettes used by
 \href{http://www.tableausoftware.com/}{Tableau}.
 }
 \examples{
-### Name: tableau_shape_pal
-### Title: Tableau Shape Palettes (discrete)
-### Aliases: tableau_shape_pal
 
-### ** Examples
 
 show_shapes(tableau_shape_pal()(5))
 
diff --git a/man/theme_base.Rd b/man/theme_base.Rd
index ca88bfca..68ad1c28 100644
--- a/man/theme_base.Rd
+++ b/man/theme_base.Rd
@@ -15,11 +15,7 @@ theme_base(base_size = 16, base_family = "")
 Theme similar to the default settings of the \sQuote{base} R graphics.
 }
 \examples{
-### Name: theme_base
-### Title: Theme Base
-### Aliases: theme_base
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
diff --git a/man/theme_calc.Rd b/man/theme_calc.Rd
index 92f78371..350aa056 100644
--- a/man/theme_calc.Rd
+++ b/man/theme_calc.Rd
@@ -15,11 +15,7 @@ theme_calc(base_size = 10, base_family = "sans")
 Theme similar to the default settings of LibreOffice Calc charts.
 }
 \examples{
-### Name: theme_calc
-### Title: Theme Calc
-### Aliases: theme_calc
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/theme_economist.Rd b/man/theme_economist.Rd
index 1a35ce45..0fda0b27 100644
--- a/man/theme_economist.Rd
+++ b/man/theme_economist.Rd
@@ -45,11 +45,7 @@ you have access to this font, you can use it with the
 \pkg{extrafont} package. "Verdana" is a good substitute.
 }
 \examples{
-### Name: theme_economist
-### Title: ggplot color theme based on the Economist
-### Aliases: theme_economist theme_economist_white
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
@@ -79,16 +75,16 @@ p + theme_economist_white() +
 ## All white variant
 p + theme_economist_white(gray_bg = FALSE) +
     scale_colour_economist()
-## Not run:
-##D ## The Economist uses ITC Officina Sans
-##D library(extrafont)
-##D p + theme_economist(base_family="ITC Officina Sans") +
-##D     scale_colour_economist()
+\dontrun{
+## The Economist uses ITC Officina Sans
+library(extrafont)
+p + theme_economist(base_family="ITC Officina Sans") +
+    scale_colour_economist()
 ##D
-##D ## Verdana is a widely available substitute
-##D p + theme_economist(base_family="Verdana") +
-##D     scale_colour_economist()
-## End(Not run)
+## Verdana is a widely available substitute
+p + theme_economist(base_family="Verdana") +
+    scale_colour_economist()
+}
 
 
 
diff --git a/man/theme_excel.Rd b/man/theme_excel.Rd
index 799d5f8d..e1c53367 100644
--- a/man/theme_excel.Rd
+++ b/man/theme_excel.Rd
@@ -21,11 +21,7 @@ Theme to replicate the ugly monstrosity that was the old
 gray-background Excel chart. Please never use this.
 }
 \examples{
-### Name: theme_excel
-### Title: ggplot color theme based on old Excel plots
-### Aliases: theme_excel
 
-### ** Examples
 
 library("ggplot2")
 # Old line color
diff --git a/man/theme_few.Rd b/man/theme_few.Rd
index dbb48def..e9a8acfc 100644
--- a/man/theme_few.Rd
+++ b/man/theme_few.Rd
@@ -16,11 +16,7 @@ Theme based on the rules and examples in
 Stephen Few, "Practical Rules for Using Color in Charts"
 }
 \examples{
-### Name: theme_few
-### Title: Theme based on Few's "Practical Rules for Using Color in Charts"
-### Aliases: theme_few
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
diff --git a/man/theme_gdocs.Rd b/man/theme_gdocs.Rd
index d35f4693..b6ac5d1d 100644
--- a/man/theme_gdocs.Rd
+++ b/man/theme_gdocs.Rd
@@ -15,11 +15,7 @@ theme_gdocs(base_size = 12, base_family = "sans")
 Theme similar to the default look of charts in Google Docs.
 }
 \examples{
-### Name: theme_gdocs
-### Title: Theme with Google Docs Chart defaults
-### Aliases: theme_gdocs
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/theme_hc.Rd b/man/theme_hc.Rd
index 2a664d3d..5232f08b 100644
--- a/man/theme_hc.Rd
+++ b/man/theme_hc.Rd
@@ -19,11 +19,7 @@ theme_hc(base_size = 12, base_family = "sans", bgcolor = "default")
 Theme based on the plots in \emph{Highcharts JS}.
 }
 \examples{
-### Name: theme_hc
-### Title: Highcharts JS theme
-### Aliases: theme_hc
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
diff --git a/man/theme_igray.Rd b/man/theme_igray.Rd
index 774f725c..d33980d5 100644
--- a/man/theme_igray.Rd
+++ b/man/theme_igray.Rd
@@ -27,11 +27,7 @@ similar to the style of plots in Stata and Tableau.
 }
 
 \examples{
-### Name: theme_igray
-### Title: Inverse gray theme
-### Aliases: theme_igray
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/theme_map.Rd b/man/theme_map.Rd
index c20e36df..16a80b81 100644
--- a/man/theme_map.Rd
+++ b/man/theme_map.Rd
@@ -15,11 +15,7 @@ theme_map(base_size = 9, base_family = "")
 A clean theme that is good for displaying maps from \code{\link{geom_map}}.
 }
 \examples{
-### Name: theme_map
-### Title: Clean theme for maps
-### Aliases: theme_map
 
-### ** Examples
 
 library("maps")
 library("ggplot2")
diff --git a/man/theme_pander.Rd b/man/theme_pander.Rd
index a851eb0e..94612653 100644
--- a/man/theme_pander.Rd
+++ b/man/theme_pander.Rd
@@ -45,11 +45,7 @@ The \pkg{pander} ships with a default theme when the 'unify plots' option is
 enabled via \code{panderOptions}, which is now also available outside of \pkg{pander} internals, like \code{evals}, \code{eval.msgs} or \code{Pandoc.brew}.
 }
 \examples{
-### Name: theme_pander
-### Title: A ggplot theme originated from the pander package
-### Aliases: theme_pander
 
-### ** Examples
 
 library("ggplot2")
 library("pander")
diff --git a/man/theme_par.Rd b/man/theme_par.Rd
index c50767ce..b87756ba 100644
--- a/man/theme_par.Rd
+++ b/man/theme_par.Rd
@@ -29,12 +29,8 @@ produced by it will not be identical to those produced by base graphics,
 most notably in the spacing of the margins.
 }
 \examples{
-### Name: theme_par
-### Title: Theme which takes its values from the current 'base' graphics
 ###   parameter values in 'par'.
-### Aliases: theme_par
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg,
diff --git a/man/theme_solarized.Rd b/man/theme_solarized.Rd
index 1c52b10f..389c5688 100644
--- a/man/theme_solarized.Rd
+++ b/man/theme_solarized.Rd
@@ -29,11 +29,7 @@ to \code{\link{theme_bw}}, while \code{theme_solarized_2} is similar to
 \code{\link{theme_gray}}.
 }
 \examples{
-### Name: theme_solarized
-### Title: ggplot color themes based on the Solarized palette
-### Aliases: theme_solarized theme_solarized_2
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/theme_solid.Rd b/man/theme_solid.Rd
index 6a4a54ca..4913866b 100644
--- a/man/theme_solid.Rd
+++ b/man/theme_solid.Rd
@@ -18,11 +18,7 @@ Theme that removes all non-geom elements (lines, text, etc),
 This theme is when only the geometric objects are desired.
 }
 \examples{
-### Name: theme_solid
-### Title: Theme with nothing other than a background color
-### Aliases: theme_solid
 
-### ** Examples
 
 library("ggplot2")
 (ggplot(mtcars, aes(wt, mpg))
diff --git a/man/theme_stata.Rd b/man/theme_stata.Rd
index a3f36a06..99ad51db 100644
--- a/man/theme_stata.Rd
+++ b/man/theme_stata.Rd
@@ -25,11 +25,7 @@ for specific graph types, a feature which \pkg{ggplot2} does not directly
 support.
 }
 \examples{
-### Name: theme_stata
-### Title: Themes based on Stata graph schemes
-### Aliases: theme_stata
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +
diff --git a/man/theme_tufte.Rd b/man/theme_tufte.Rd
index 6b86fec4..34776728 100644
--- a/man/theme_tufte.Rd
+++ b/man/theme_tufte.Rd
@@ -29,11 +29,7 @@ installed on your system, then you can use them with the package
 \bold{extrafont}.
 }
 \examples{
-### Name: theme_tufte
-### Title: Tufte Maximal Data, Minimal Ink Theme
-### Aliases: theme_tufte
 
-### ** Examples
 
 library("ggplot2")
 # with ticks and range frames
@@ -44,17 +40,17 @@ library("ggplot2")
 (ggplot(mtcars, aes(wt, mpg))
  + geom_point() + geom_rug()
  + theme_tufte(ticks=FALSE))
-## Not run: 
-##D ## Using the Bembo serif family
-##D library(extrafont)
-##D (ggplot(mtcars, aes(wt, mpg))
-##D  + geom_point() + geom_rangeframe()
-##D  + theme_tufte(base_family='BemboStd'))
-##D ## Using the Gill Sans sans serif family
-##D (ggplot(mtcars, aes(wt, mpg))
-##D  + geom_point() + geom_rangeframe()
-##D  + theme_tufte(base_family='GillSans'))
-## End(Not run)
+\dontrun{
+## Using the Bembo serif family
+library(extrafont)
+(ggplot(mtcars, aes(wt, mpg))
+ + geom_point() + geom_rangeframe()
+ + theme_tufte(base_family='BemboStd'))
+## Using the Gill Sans sans serif family
+(ggplot(mtcars, aes(wt, mpg))
+ + geom_point() + geom_rangeframe()
+ + theme_tufte(base_family='GillSans'))
+}
 
 
 
diff --git a/man/theme_wsj.Rd b/man/theme_wsj.Rd
index 726ee329..f905a15d 100644
--- a/man/theme_wsj.Rd
+++ b/man/theme_wsj.Rd
@@ -22,11 +22,7 @@ theme_wsj(base_size = 12, color = "brown", base_family = "sans",
 Theme based on the plots in \emph{The Wall Street Journal}.
 }
 \examples{
-### Name: theme_wsj
-### Title: Wall Street Journal theme
-### Aliases: theme_wsj
 
-### ** Examples
 
 library("ggplot2")
 p <- ggplot(mtcars) +