diff --git a/samples/AccelerometerPlay/_index.jd b/samples/AccelerometerPlay/_index.jd
new file mode 100644
index 000000000..197e45357
--- /dev/null
+++ b/samples/AccelerometerPlay/_index.jd
@@ -0,0 +1,7 @@
+page.tags="Sensor", "Accelerometer"
+sample.tags="Accelerometer", "Games"
+sample.groups="Sensors"
+@jd:body
+
+<p>Example code that shows how to use the device accelerometer in apps and games.</p>
+
diff --git a/samples/ActionBarCompat/_index.html b/samples/ActionBarCompat/_index.jd
similarity index 52%
rename from samples/ActionBarCompat/_index.html
rename to samples/ActionBarCompat/_index.jd
index 8808de182..946570b7e 100644
--- a/samples/ActionBarCompat/_index.html
+++ b/samples/ActionBarCompat/_index.jd
@@ -1,18 +1,7 @@
-<!--
-  Copyright 2011 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
+page.tags="ActionBar", "Compatibility", "Support Library"
+sample.tags="UI", "ActionBar", "Support Library"
+sample.group="Input"
+@jd:body
 
 <p>This sample shows how to use the action bar design pattern on pre-API 11 devices and the built-in
 <a href="../../../reference/android/app/ActionBar.html">ActionBar</a> on devices supporting API
@@ -22,4 +11,4 @@ action item definition mechanism as the new framework API, even supporting the
 <code>android:showAsAction</code> attribute to a limited extent.</p>
 
 <img alt="" src="../images/ActionBarCompat1.png" height="320" />
-<img alt="" src="../images/ActionBarCompat2.png" height="320" />
+<img alt="" src="../images/ActionBarCompat2.png" height="320" />
\ No newline at end of file
diff --git a/samples/BluetoothHDP/_index.html b/samples/BluetoothHDP/_index.jd
old mode 100755
new mode 100644
similarity index 88%
rename from samples/BluetoothHDP/_index.html
rename to samples/BluetoothHDP/_index.jd
index 3fb3babf7..cf5f555af
--- a/samples/BluetoothHDP/_index.html
+++ b/samples/BluetoothHDP/_index.jd
@@ -1,3 +1,8 @@
+page.tags="Bluetooth", "HDP"
+sample.tags="Bluetooth", "Health"
+sample.group="Connectivity"
+@jd:body
+
 <p>A sample application that demonstrates how to communicate with a Bluetooth Health Device Profile (HDP) device.  This feature is available on Android 4.0 (API level 14) or above platforms. The Android Bluetooth Health API lets you create
 applications that use Bluetooth to communicate with health devices that support
 Bluetooth, such as heart-rate monitors, blood meters, thermometers, scales, and
@@ -9,5 +14,4 @@ MDC_DEV_SPEC_PROFILE_* in the Nomenclature Codes Annex.</p>
 
 <p>The application manages connection with Bluetooth HDP-enabled devices.  Possible device type include blood pressure monitor, glucose meter, thermometer, etc.  Upon connection, the application retrieves raw data sent from the device.  Note that in order to interpret the data, a parser that conforms to the IEEE 11073-xxxxx specifications would be required.</p>
 
-<img alt="" src="../images/BluetoothHDP.png" />
-
+<img alt="" src="../images/BluetoothHDP.png" />
\ No newline at end of file
diff --git a/samples/BluetoothLeGatt/_index.jd b/samples/BluetoothLeGatt/_index.jd
new file mode 100644
index 000000000..b73d51943
--- /dev/null
+++ b/samples/BluetoothLeGatt/_index.jd
@@ -0,0 +1,9 @@
+page.tags="Bluetooth", "LE", "SMART"
+sample.tags="Bluetooth", "LE"
+sample.group="Connectivity"
+@jd:body
+
+<p>A sample application that demonstrates how to communicate with
+a Bluetooth SMART (Low Energy) device.  This feature is available on
+Android 4.3 (API level 14) or above platforms. </p>
+