diff --git a/examples/all-overlays-google.html b/examples/all-overlays-google.html
index 9d2527098d..9df8cff1d3 100644
--- a/examples/all-overlays-google.html
+++ b/examples/all-overlays-google.html
@@ -15,7 +15,7 @@
     <body onload="init()">
         <h1 id="title">All Overlays with Google and OSM</h1>
         <div id="tags">
-            overlay, baselayer, google, osm, openstreetmap
+            overlay, baselayer, google, osm, openstreetmap, light
         </div>
         <p id="shortdesc">
             Using the Google and OSM layers as overlays.
diff --git a/examples/all-overlays.html b/examples/all-overlays.html
index cecda0e79c..49e138e0e3 100644
--- a/examples/all-overlays.html
+++ b/examples/all-overlays.html
@@ -61,7 +61,7 @@
     <body onload="init()">
         <h1 id="title">OpenLayers Overlays Only Example</h1>
         <div id="tags">
-            overlay, baselayer
+            overlay, baselayer, light
         </div> 
         <p id="shortdesc">
             Demonstrates a map with overlays only.
diff --git a/examples/animated_panning.html b/examples/animated_panning.html
index a07017cc8e..3baa23f836 100644
--- a/examples/animated_panning.html
+++ b/examples/animated_panning.html
@@ -78,7 +78,7 @@
   <body onload="init()">
     <h1 id="title">map.panTo Example</h1>
     <div id="tags">
-        panning, animation, effect, smooth, panMethod
+        panning, animation, effect, smooth, panMethod, light
     </div>
     <div id="shortdesc">Show animated panning effects in the map</div>
     <div id="map" class="smallmap"></div>
diff --git a/examples/attribution.html b/examples/attribution.html
index 328f3427c8..1f4ce12ba4 100644
--- a/examples/attribution.html
+++ b/examples/attribution.html
@@ -40,7 +40,7 @@
         <h1 id="title">Attribution Example</h1>
 
         <div id="tags">
-            copyright, watermark, logo, attribution
+            copyright, watermark, logo, attribution, light
         </div>
 
         <p id="shortdesc">
diff --git a/examples/bing-tiles-restrictedzoom.html b/examples/bing-tiles-restrictedzoom.html
index afbd6a9fb6..c68ea3d428 100644
--- a/examples/bing-tiles-restrictedzoom.html
+++ b/examples/bing-tiles-restrictedzoom.html
@@ -20,7 +20,7 @@
     <h1 id="title">Bing Tiles with a Subset of Resolutions Example</h1>
 
     <div id="tags">
-        bing tiles restrictedMinZoom numZoomLevels
+        bing tiles restrictedMinZoom numZoomLevels, light
     </div>
 
     <div id="shortdesc">Use Bing with direct tile access</div>
diff --git a/examples/bing-tiles.html b/examples/bing-tiles.html
index dbc55d8314..f3fe61dfae 100644
--- a/examples/bing-tiles.html
+++ b/examples/bing-tiles.html
@@ -20,7 +20,7 @@
     <h1 id="title">Basic Bing Tiles Example</h1>
 
     <div id="tags">
-        bing tiles
+        bing tiles, light
     </div>
 
     <div id="shortdesc">Use Bing with direct tile access</div>
diff --git a/examples/bing.html b/examples/bing.html
index 6f43336ef8..3f0c4cb3cc 100644
--- a/examples/bing.html
+++ b/examples/bing.html
@@ -48,7 +48,7 @@
     <h1 id="title">Bing Example</h1>
 
     <div id="tags">
-        Bing, Microsoft, Virtual Earth
+        Bing, Microsoft, Virtual Earth, light
     </div>
 
     <p id="shortdesc">
diff --git a/examples/boxes-vector.html b/examples/boxes-vector.html
index f3b5f01972..d18dbbdcc0 100644
--- a/examples/boxes-vector.html
+++ b/examples/boxes-vector.html
@@ -45,7 +45,7 @@
         <h1 id="title">Boxes Example Vector</h1>
 
         <div id="tags">
-            box, vector, annotation
+            box, vector, annotation, light
         </div>
 
         <p id="shortdesc">
diff --git a/examples/buffer.html b/examples/buffer.html
index db810bae46..77e88c4f9c 100644
--- a/examples/buffer.html
+++ b/examples/buffer.html
@@ -37,7 +37,7 @@
         <h1 id="title">Buffer Example</h1>
 
         <div id="tags">
-            buffer, performance, tile
+            buffer, performance, tile, light
         </div>
 
         <p id="shortdesc">
diff --git a/examples/click.html b/examples/click.html
index 98945c33b3..094ff2922f 100644
--- a/examples/click.html
+++ b/examples/click.html
@@ -70,7 +70,7 @@
 
         <div id="tags">
             click control, double, doubleclick, double-click, event, events, 
-            propagation
+            propagation, light
         </div>
 
         <p id="shortdesc">
diff --git a/examples/clientzoom.html b/examples/clientzoom.html
index f69f65bd21..c32c7c1913 100644
--- a/examples/clientzoom.html
+++ b/examples/clientzoom.html
@@ -8,7 +8,7 @@
         <link rel="stylesheet" href="../theme/default/style.css" type="text/css"/>
         <link rel="stylesheet" href="style.css" type="text/css">
         <script src="../lib/Firebug/firebug.js"></script>
-        <script src="../lib/OpenLayers.js"></script>
+		<script src="../lib/OpenLayers.js"></script>
         <script src="clientzoom.js"></script>
         <style>
             .olControlAttribution {
diff --git a/examples/custom-control.html b/examples/custom-control.html
index 16b9e50bd2..86887518e9 100644
--- a/examples/custom-control.html
+++ b/examples/custom-control.html
@@ -50,7 +50,7 @@
         <h1 id="title">Custom Control Example</h1>
 
         <div id="tags">
-            control, panel, rectangle
+            control, panel, rectangle, light
         </div>
 
         <p id="shortdesc">
diff --git a/examples/example.html b/examples/example.html
index 84a0bc35a5..cfaccb86cb 100644
--- a/examples/example.html
+++ b/examples/example.html
@@ -10,7 +10,7 @@
     </head>
     <body>
         <h1 id="title">OpenLayers Example</h1>
-        <div id="tags">simple, basic</div>
+        <div id="tags">simple, basic, light</div>
         <p id="shortdesc">
             Demonstrate a simple map with an overlay that includes layer switching controls.
         </p>
diff --git a/examples/geojson.html b/examples/geojson.html
index 528dd3ccd4..741add67f7 100644
--- a/examples/geojson.html
+++ b/examples/geojson.html
@@ -63,7 +63,7 @@
     <h1 id="title">GeoJSON Example</h1>
     
     <div id="tags">
-       JSON, GeoJSON
+       JSON, GeoJSON, light
     </div>
 
       <p id="shortdesc">
diff --git a/examples/google-static.html b/examples/google-static.html
index 96847cb83b..d35efb0ac5 100644
--- a/examples/google-static.html
+++ b/examples/google-static.html
@@ -11,7 +11,7 @@
     <body>
         <h1 id="title">Google (Static Maps API) Grid Layer Example</h1>
         <div id="tags">
-            Google, grid, static, GMaps
+            Google, grid, static, GMaps, light
         </div>
         <p id="shortdesc">
             Using the Google Static Maps API with a Grid Layer.
diff --git a/examples/google-v3-alloverlays.html b/examples/google-v3-alloverlays.html
index dac1d15f13..d4b368b171 100644
--- a/examples/google-v3-alloverlays.html
+++ b/examples/google-v3-alloverlays.html
@@ -15,7 +15,7 @@
     <body onload="init()">
         <h1 id="title">Google (v3) allOverlays Layer Example</h1>
         <div id="tags">
-            Google, overlay
+            Google, overlay, light
         </div>
         <p id="shortdesc">
             Demonstrate use the Google Maps v3 API with allOverlays set to true on the map.
diff --git a/examples/google-v3.html b/examples/google-v3.html
index 849d7cd273..8b4a348b9b 100644
--- a/examples/google-v3.html
+++ b/examples/google-v3.html
@@ -15,7 +15,7 @@
     <body onload="init()">
         <h1 id="title">Google (v3) Layer Example</h1>
         <div id="tags">
-            Google, api key, apikey
+            Google, api key, apikey, light
         </div>
         <p id="shortdesc">
             Demonstrate use the Google Maps v3 API.
diff --git a/examples/graphic-name.html b/examples/graphic-name.html
index 033f71af1d..a530f10834 100644
--- a/examples/graphic-name.html
+++ b/examples/graphic-name.html
@@ -14,7 +14,7 @@
     <body onload="init();">
         <h1 id="title">Named Graphics Example</h1>
         <div id="tags">
-            vector, named graphic, star, cross, x, square, triangle, circle, style
+            vector, named graphic, star, cross, x, square, triangle, circle, style, light
         </div>
         <p id="shortdesc">
             Shows how to use well-known graphic names.
diff --git a/examples/gutter.html b/examples/gutter.html
index 6a9bd80559..1a98a5c612 100644
--- a/examples/gutter.html
+++ b/examples/gutter.html
@@ -18,7 +18,7 @@
     <h1 id="title">Gutter Example</h1>
 
     <div id="tags">
-        gutter, quality, tile
+        gutter, quality, tile, light
     </div>
 
     <p id="shortdesc">
diff --git a/examples/late-render.html b/examples/late-render.html
index ed3f9da45e..8502e2a4fd 100644
--- a/examples/late-render.html
+++ b/examples/late-render.html
@@ -29,7 +29,7 @@
     <h1 id="title">Late Rendering</h1>
 
     <div id="tags">
-        creation, render, div
+        creation, render, div, light
     </div>
 
     <p id="shortdesc">
diff --git a/examples/layer-opacity.html b/examples/layer-opacity.html
index 5fc76a80a9..555cc9587b 100644
--- a/examples/layer-opacity.html
+++ b/examples/layer-opacity.html
@@ -70,7 +70,7 @@
     <h1 id="title">Layer Opacity Example</h1>
 
     <div id="tags">
-        opacity, transparent, transparency
+        opacity, transparent, transparency, light
     </div>
 
     <p id="shortdesc">
diff --git a/examples/layerLoadMonitoring.html b/examples/layerLoadMonitoring.html
index 281fd7894f..dcf4bca395 100644
--- a/examples/layerLoadMonitoring.html
+++ b/examples/layerLoadMonitoring.html
@@ -112,7 +112,7 @@
       <h1 id="title">Layer Load Monitoring Example</h1>
 
       <div id="tags">
-        monitor, loading
+        monitor, loading, light
       </div>
 
       <p id="shortdesc">
diff --git a/examples/layerswitcher.html b/examples/layerswitcher.html
index 5e3f6b552f..791a4d0c28 100644
--- a/examples/layerswitcher.html
+++ b/examples/layerswitcher.html
@@ -42,7 +42,7 @@
     <h1 id="title">Layer Switcher Example</h1>
 
     <div id="tags">
-        tree, layerswitcher, reposition
+        tree, layerswitcher, reposition, light
     </div>
 
     <p id="shortdesc">
diff --git a/examples/markerResize.html b/examples/markerResize.html
index cb59bcf852..8d2695d67d 100644
--- a/examples/markerResize.html
+++ b/examples/markerResize.html
@@ -45,7 +45,7 @@
   <body onload="init()">
     <h1 id="title">Resize a Marker</h1>
     <div id="tags">
-        animation, resizing, style, size
+        animation, resizing, style, size, light
     </div>
     <div id="shortdesc">Dynamically resize a marker</div>
     <div id="map" class="smallmap"></div>
diff --git a/examples/multiserver.html b/examples/multiserver.html
index 4b7654c0d3..64a5a452e4 100644
--- a/examples/multiserver.html
+++ b/examples/multiserver.html
@@ -31,7 +31,7 @@
     <h1 id="title">Multiple Server URLS</h1>
 
   <div id="tags">
-    performance, multiple urls, request
+    performance, multiple urls, request, light
   </div>
   <p id="shortdesc">
       Load your tiles faster by pointing to the same server, but with different urls
diff --git a/examples/navigation-control.html b/examples/navigation-control.html
index 661c42cddb..a0c272e9a8 100644
--- a/examples/navigation-control.html
+++ b/examples/navigation-control.html
@@ -26,7 +26,7 @@
     <h1 id="title">Navigation Control</h1>
 
     <div id="tags">
-        drag, move, zoom, navigate
+        drag, move, zoom, navigate, light
     </div>
 
     <div id="shortdesc">Demonstrate Navigation Control features</div>
diff --git a/examples/ordering.html b/examples/ordering.html
index 262c379f34..f6fd1f461c 100644
--- a/examples/ordering.html
+++ b/examples/ordering.html
@@ -177,7 +177,7 @@
         <h1 id="title">Z-Index/Y-Order Example</h1>
 
         <div id="tags">
-            stack, stacking, zindex, ordering
+            stack, stacking, zindex, ordering, light
         </div>
 
         <p id="shortdesc">
diff --git a/examples/osm-google.html b/examples/osm-google.html
index 39c31dd910..a09cba59dd 100644
--- a/examples/osm-google.html
+++ b/examples/osm-google.html
@@ -18,7 +18,7 @@
             Demonstrate use of an OSM layer and a Google layer as base layers.
         </p>
         <div id="tags">
-            openstreetmap google
+            openstreetmap google light
         </div>
         <div id="map" class="smallmap"></div>
         <div id="docs">
diff --git a/examples/osm-grayscale.html b/examples/osm-grayscale.html
index 27e7095b3d..0ff3729339 100644
--- a/examples/osm-grayscale.html
+++ b/examples/osm-grayscale.html
@@ -59,7 +59,7 @@
     <h1 id="title">Grayscale OSM Example</h1>
 
     <div id="tags">
-        openstreetmap canvas grayscale
+        openstreetmap canvas grayscale light
     </div>
 
     <div id="shortdesc">Show an OSM Map in grayscale</div>
diff --git a/examples/osm.html b/examples/osm.html
index e6458f1c6a..ecd7c01bc3 100644
--- a/examples/osm.html
+++ b/examples/osm.html
@@ -27,7 +27,7 @@
     <h1 id="title">Basic OSM Example</h1>
 
     <div id="tags">
-        openstreetmap basic
+        openstreetmap basic light
     </div>
 
     <div id="shortdesc">Show a Simple OSM Map</div>
diff --git a/examples/resize-features.html b/examples/resize-features.html
index 521d501e24..2bf68f7220 100644
--- a/examples/resize-features.html
+++ b/examples/resize-features.html
@@ -85,7 +85,7 @@
   <body onload="init()">
     <h1 id="title">Resize Features Programatically</h1>
     <div id="tags">
-        vector, feature, resizing, resize
+        vector, feature, resizing, resize, light
     </div>    
     <p id="shortdesc">
       Demonstration of how to use the geometry resize methods to
diff --git a/examples/restricted-extent.html b/examples/restricted-extent.html
index db5d7ec513..7ab4ca8584 100644
--- a/examples/restricted-extent.html
+++ b/examples/restricted-extent.html
@@ -42,7 +42,7 @@
   <body onload="init()">
     <h1 id="title">OpenLayers Restricted Extent Example</h1>
     <div id="tags">
-        map, restrict, restrictedextent, extent
+        map, restrict, restrictedextent, extent, light
     </div>    
     <p id="shortdesc">
       Don't let users drag outside the map extent: instead, limit dragging such
diff --git a/examples/rotate-features.html b/examples/rotate-features.html
index 8a8eb0285b..51e559b2b2 100644
--- a/examples/rotate-features.html
+++ b/examples/rotate-features.html
@@ -99,7 +99,7 @@
     <h1 id="title">Rotate vector features</h1>
 
     <div id="tags">
-        vector, feature, rotating, rotation, rotate, advanced
+        vector, feature, rotating, rotation, rotate, advanced, light
     </div>
   <p id="shortdesc">
       Details on how to create and rotate vector features programmatically
diff --git a/examples/select-feature-multilayer.html b/examples/select-feature-multilayer.html
index 751ee73af5..6b8f3f4abb 100644
--- a/examples/select-feature-multilayer.html
+++ b/examples/select-feature-multilayer.html
@@ -117,7 +117,7 @@
   <body onload="init()">
     <h1 id="title">OpenLayers Select Feature on Multiple Layers Example</h1>
     <div id="tags">
-        vector, feature, selecting, selection, advanced
+        vector, feature, selecting, selection, advanced, light
     </div>     
     <p id="shortdesc">
       Select a feature on click with the Control.SelectFeature on multiple 
diff --git a/examples/single-tile.html b/examples/single-tile.html
index 1a6d869373..54da081f42 100644
--- a/examples/single-tile.html
+++ b/examples/single-tile.html
@@ -10,7 +10,7 @@
     </head>
     <body>
         <h1 id="title">Single Tile Example</h1>
-        <div id="tags">tile, ratio, singleTile, performance</div>
+        <div id="tags">tile, ratio, singleTile, performance, light</div>
         <p id="shortdesc">
             Use the singleTile option on gridded layers to request a single tile.
         </p>  
diff --git a/examples/style-rules.html b/examples/style-rules.html
index 987b01e8f7..27f31f1ed6 100644
--- a/examples/style-rules.html
+++ b/examples/style-rules.html
@@ -13,7 +13,7 @@
     <body onload="init()">
         <h1 id="title">Rule Based Style</h1>
         <div id="tags">
-            vector, feature, stylemap, filter, comparison
+            vector, feature, stylemap, filter, comparison, light
         </div>        
         <p id="shortdesc">
             Use rule based styling to use different symbolizers for different
diff --git a/examples/stylemap.html b/examples/stylemap.html
index 6e712e8f4a..f3764af5e5 100644
--- a/examples/stylemap.html
+++ b/examples/stylemap.html
@@ -73,7 +73,7 @@
     <h1 id="title">StyleMap Example</h1>
 
     <div id="tags">
-        vector, feature, stylemap
+        vector, feature, stylemap, light
     </div>
 
     <p id="shortdesc">
diff --git a/examples/styles-context.html b/examples/styles-context.html
index e9e35bc335..853e8c3db9 100644
--- a/examples/styles-context.html
+++ b/examples/styles-context.html
@@ -92,7 +92,7 @@
     <h1 id="title">Feature Styles Example</h1>
 
     <div id="tags">
-        vector, feature, stylemap
+        vector, feature, stylemap, light
     </div>
 
     <p id="shortdesc">
diff --git a/examples/styles-rotation.html b/examples/styles-rotation.html
index ed2144838b..b6d6f95f86 100644
--- a/examples/styles-rotation.html
+++ b/examples/styles-rotation.html
@@ -76,7 +76,7 @@
   <body onload="init()">
     <h1 id="title">Rotation Style Example</h1>
     <div id="tags">
-        vector, feature, stylemap, rotation, cleanup
+        vector, feature, stylemap, rotation, cleanup, light
     </div>    
     <p id="shortdesc">
         Use the rotation property of a point symbolizer to rotate
diff --git a/examples/styles-unique.html b/examples/styles-unique.html
index 7135466f72..ccea4ed638 100644
--- a/examples/styles-unique.html
+++ b/examples/styles-unique.html
@@ -94,7 +94,7 @@
     <h1 id="title">Unique Value Styles Example</h1>
 
     <div id="tags">
-        vector, feature, stylemap, uniquevalue, cleanup
+        vector, feature, stylemap, uniquevalue, cleanup, light
     </div>
 
     <p id="shortdesc">
diff --git a/examples/symbolizers-fill-stroke-graphic.html b/examples/symbolizers-fill-stroke-graphic.html
index f28c8c2e67..27a0b588a0 100644
--- a/examples/symbolizers-fill-stroke-graphic.html
+++ b/examples/symbolizers-fill-stroke-graphic.html
@@ -126,7 +126,7 @@
   <body onload="init()">
     <h1 id="title">OpenLayers Example</h1>
     <div id="tags">
-        vector, feature, symbolizer, filter, comparison, labeling
+        vector, feature, symbolizer, filter, comparison, labeling, light
     </div>
     <p id="shortdesc">
         Demonstrate fill, stroke, and graphic property of symbolizers.
diff --git a/examples/tile-origin.html b/examples/tile-origin.html
index 78339d4c19..6e97aeba20 100644
--- a/examples/tile-origin.html
+++ b/examples/tile-origin.html
@@ -11,7 +11,7 @@
     <body>
         <h1 id="title">Tile Origin</h1>
         <div id="tags">
-            grid, tileOrigin
+            grid, tileOrigin, light
         </div>
         <p id="shortdesc">
             Demonstrates the use of the tileExtent property to differentiate 
diff --git a/examples/transition.html b/examples/transition.html
index 6404c4ca1e..7d82b8bbb6 100644
--- a/examples/transition.html
+++ b/examples/transition.html
@@ -46,7 +46,7 @@
   <body onload="init()">
     <h1 id="title">Transition Example</h1>
     <div id="tags">
-        transition, resize, tile, singletile
+        transition, resize, tile, singletile, light
     </div>    
     <p id="shortdesc">
         Demonstrates the use of transition effects in tiled and untiled layers.
diff --git a/examples/vector-features-with-text.html b/examples/vector-features-with-text.html
index d32fd89e15..c3e9e02b48 100644
--- a/examples/vector-features-with-text.html
+++ b/examples/vector-features-with-text.html
@@ -125,7 +125,7 @@
   <body onload="init()">
     <h1 id="title">OpenLayers Labeled features example</h1>
     <div id="tags">
-        vector, feature, labeling, symbolizer
+        vector, feature, labeling, symbolizer, light
     </div>
     <p id="shortdesc">
         Label vector features with a text symbolizer.
diff --git a/examples/vector-features.html b/examples/vector-features.html
index 0a48a3071c..70fc34a180 100644
--- a/examples/vector-features.html
+++ b/examples/vector-features.html
@@ -123,7 +123,7 @@
 <h1 id="title">Drawing Simple Vector Features Example</h1>
 
 <div id="tags">
-    vector, feature
+    vector, feature, light
 </div>
 <p id="shortdesc">
     Shows the use of the shows drawing simple vector features, in different styles.
diff --git a/examples/wms-long-url.html b/examples/wms-long-url.html
index 023345be37..331e68f941 100644
--- a/examples/wms-long-url.html
+++ b/examples/wms-long-url.html
@@ -12,7 +12,7 @@
     <h1 id="title">WMS with POST Requests to Avoid Long URLs</h1>
 
     <div id="tags">
-        sld, sld_body, post, iframe, advanced
+        sld, sld_body, post, iframe, advanced, light
     </div>
 
     <div id="shortdesc">Render tiles in IMG or IFRAME elements, depending on
diff --git a/examples/wms-untiled.html b/examples/wms-untiled.html
index e9dcacc6e6..9651eac734 100644
--- a/examples/wms-untiled.html
+++ b/examples/wms-untiled.html
@@ -32,7 +32,7 @@
     <h1 id="title"> WMS Untiled Example</h1>
 
     <div id="tags">
-        singletile, tile
+        singletile, tile, light
     </div>
         <p id="shortdesc">
             Shows an example of an "untiled" WMS layer, which requests a single
diff --git a/examples/wms-v13.html b/examples/wms-v13.html
index b917e75f2b..427a829e93 100644
--- a/examples/wms-v13.html
+++ b/examples/wms-v13.html
@@ -40,7 +40,7 @@
     <h1 id="title"> WMS version 1.3 (axis order) Example</h1>
 
     <div id="tags">
-        axis order, wms 1.3
+        axis order, wms 1.3, light
     </div>
         <p id="shortdesc">
             Shows an example of the influence of axis order on WMS 1.3 GetMap requests.
diff --git a/examples/zoom.html b/examples/zoom.html
index 3b0f9a22e1..8ca11bf747 100644
--- a/examples/zoom.html
+++ b/examples/zoom.html
@@ -41,7 +41,7 @@
     </head>
     <body>
         <h1 id="title">Zoom Control Example</h1>
-        <div id="tags">zoom control</div>
+        <div id="tags">zoom control light</div>
 
         <div id="shortdesc">Shows how to use a simple zoom control.</div>
 
