diff --git a/examples_src/full-screen.css b/examples_src/full-screen.css
new file mode 100644
index 0000000000..73a0a5a9a2
--- /dev/null
+++ b/examples_src/full-screen.css
@@ -0,0 +1,15 @@
+.map:-moz-full-screen {
+ height: 100%;
+}
+.map:-webkit-full-screen {
+ height: 100%;
+}
+.map:-ms-fullscreen {
+ height: 100%;
+}
+.map:fullscreen {
+ height: 100%;
+}
+.ol-rotate {
+ top: 3em;
+}
\ No newline at end of file
diff --git a/examples_src/full-screen.html b/examples_src/full-screen.html
index 638be7f120..176c83b491 100644
--- a/examples_src/full-screen.html
+++ b/examples_src/full-screen.html
@@ -1,70 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
- Full screen control example
-
-
-
-
-
-
-
-
-
-
-
-
-
Full screen control example
-
Example of a full screen control.
-
-
Click the control in the top right corner to go full screen. Click it again to exit full screen.
-
If there is no button on the map, your browser does not support the Full Screen API.
-
See the full-screen.js source to see how this is done.
-
-
full-screen, bing, bing-maps
-
-
-
-
-
-
-
-
-
-
-
-
+---
+template: "example.html"
+title: "Full screen control example"
+shortdesc: "Example of a full screen control."
+docs: >
+ Click the control in the top right corner to go full screen. Click it again to exit full screen.
+ If there is no button on the map, your browser does not support the Full Screen API.
+tags: "full-screen, bing, bing-maps"
+---
+
diff --git a/examples_src/geojson.html b/examples_src/geojson.html
index 54cc237742..a064983427 100644
--- a/examples_src/geojson.html
+++ b/examples_src/geojson.html
@@ -1,51 +1,13 @@
-
-
-
-
-
-
-
-
-
-
- GeoJSON example
-
-
-
-
-
-
-
-
-
-
-
-
-
GeoJSON example
-
Example of GeoJSON features.
-
-
geojson, vector, openstreetmap
-
-
-
-
-
-
-
-
-
-
-
-
+---
+template: "example.html"
+title: "GeoJSON example"
+shortdesc: "Example of GeoJSON features."
+docs: >
+ Example of GeoJSON features.
+tags: "geojson, vector, openstreetmap"
+---
+
diff --git a/examples_src/geolocation-orientation.css b/examples_src/geolocation-orientation.css
new file mode 100644
index 0000000000..9ac812bcf6
--- /dev/null
+++ b/examples_src/geolocation-orientation.css
@@ -0,0 +1,13 @@
+#info {
+ position: absolute;
+ font-size: 0.7em;
+ top: 70px;
+ right: 30px;
+ background-color: lightgrey;
+ padding: 4px;
+}
+.button {
+ position: absolute;
+ bottom: 10px;
+ left: 30px;
+}
diff --git a/examples_src/geolocation-orientation.html b/examples_src/geolocation-orientation.html
index 5dd4fe3f61..71f956c8e7 100644
--- a/examples_src/geolocation-orientation.html
+++ b/examples_src/geolocation-orientation.html
@@ -1,53 +1,20 @@
-
-
-
-
-
-
-
-
-
-
- Mobile Geolocation Tracking with Orientation
-
-
-
-
+---
+template: "example.html"
+title: "Mobile Geolocation Tracking with Orientation"
+shortdesc: "Example of a geolocated and oriented map."
+docs: >
+ Geolocation tracking with orientation example.
+tags: "fullscreen, geolocation, orientation, mobile"
+---
+
+
+
+
+
+
+
+

-
-
-
-
-
-
-
-
-
-
-
Geolocation tracking with orientation example
-
Example of a geolocated and oriented map.
-
fullscreen, geolocation, orientation, mobile
-
-
-
+
+