diff --git a/examples_src/epsg-4326.html b/examples_src/epsg-4326.html
index 8fd47ec4e3..13650d1d91 100644
--- a/examples_src/epsg-4326.html
+++ b/examples_src/epsg-4326.html
@@ -1,51 +1,13 @@
-
-
-
-
-
+---
+template: "example.html"
+title: "Export map example"
+shortdesc: "Example of exporting a map as a PNG image."
+docs: >
+ Example of exporting a map as a PNG image.
+tags: "export, png, openstreetmap"
+---
+
+
+
+
+ This example requires a browser that supports the
+
link download attribute.
-
-
-
-
-
-
-
-
-
Export map example
-
Example of exporting a map as a PNG image.
-
-
export, png, openstreetmap
-
-
-
-
-
-
-
-
-
-
-
-
+
Export PNG
+
+
diff --git a/examples_src/fractal.css b/examples_src/fractal.css
new file mode 100644
index 0000000000..3137217cf6
--- /dev/null
+++ b/examples_src/fractal.css
@@ -0,0 +1,6 @@
+.map {
+ background: whitesmoke;
+}
+#depth {
+ width: 100px;
+}
diff --git a/examples_src/fractal.html b/examples_src/fractal.html
index 4904d81d94..2d624cf154 100644
--- a/examples_src/fractal.html
+++ b/examples_src/fractal.html
@@ -1,64 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
Fractal Example
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Fractal Example
-
Example of a fractal.
-
- depth:
-
- (# points)
-
-
-
fractal, vector
-
-
-
-
-
-
-
-
-
-
-
-
+---
+template: "example.html"
+title: "Fractal Example"
+shortdesc: "Example of a fractal."
+docs: >
+ Example of a fractal.
+tags: "fractal, vector"
+---
+
+
+
+
+ depth:
+
+ (# points)
+
+
+
diff --git a/examples_src/full-screen-drag-rotate-and-zoom.css b/examples_src/full-screen-drag-rotate-and-zoom.css
new file mode 100644
index 0000000000..94db38f643
--- /dev/null
+++ b/examples_src/full-screen-drag-rotate-and-zoom.css
@@ -0,0 +1,9 @@
+.map:-moz-full-screen {
+ height: 100%;
+}
+.map:-webkit-full-screen {
+ height: 100%;
+}
+.map:fullscreen {
+ height: 100%;
+}
\ No newline at end of file
diff --git a/examples_src/full-screen-drag-rotate-and-zoom.html b/examples_src/full-screen-drag-rotate-and-zoom.html
index 3720462e6a..e6e93999e0 100644
--- a/examples_src/full-screen-drag-rotate-and-zoom.html
+++ b/examples_src/full-screen-drag-rotate-and-zoom.html
@@ -1,64 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
Full screen drag rotate and zoom example
-
-
-
-
-
-
-
-
-
-
-
-
-
Full screen drag rotate and zoom example
-
Example of drag rotate and zoom control with full screen effect.
-
-
Hold down Shift + drag to rotate and zoom. Click the button in the top right corner to go full screen. Then do the Shift + drag thing again.
-
If there is no button on the map, your browser does not support the Full Screen API .
-
See the full-screen-drag-rotate-and-zoom.js source to see how this is done.
-
-
full-screen, drag, rotate, zoom, bing, bing-maps
-
-
-
-
-
-
-
-
-
-
-
-
+---
+template: "example.html"
+title: "Full screen drag rotate and zoom example"
+shortdesc: "Example of drag rotate and zoom control with full screen effect."
+docs: >
+
Hold down Shift + drag to rotate and zoom. Click the button in the top right corner to go full screen. Then do the Shift + drag thing again.
+
If there is no button on the map, your browser does not support the Full Screen API .
+tags: "full-screen, drag, rotate, zoom, bing, bing-maps"
+---
+