diff --git a/sd/miniport/sdhc/README.md b/sd/miniport/sdhc/README.md
index b5c350933..a1e81cdee 100644
--- a/sd/miniport/sdhc/README.md
+++ b/sd/miniport/sdhc/README.md
@@ -1,5 +1,15 @@
+<!---
+    name: Standard SD Host Controller Miniport
+    platform: WDM
+    language: cpp
+    category: Storage
+    description: Provides a functional miniport implementation for a standard SD host controller.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617952
+--->
+
+
 Standard SD Host Controller Miniport
-===================
+====================================
 
 This is a sample for a Secure Digital (SD) Host Controller miniport driver. The driver works in conjunction with sdport.sys, which implements SD/SDIO/eMMC protocol and WDM interfaces, to provide the host register interface.
 
diff --git a/sd/sdiomars/README.md b/sd/sdiomars/README.md
index 322ac5a4d..2f2489362 100644
--- a/sd/sdiomars/README.md
+++ b/sd/sdiomars/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: SDIO Driver 
+    platform: KMDF
+    language: cpp
+    category: Storage
+    description: A functional KMDF Secure Digital (SD) IO driver for use with a generic mars development board.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617953
+--->
+
+
 Storage SDIO Driver
 ===================
 
diff --git a/security/elam/README.md b/security/elam/README.md
index 927dc32d2..bbd5b7721 100644
--- a/security/elam/README.md
+++ b/security/elam/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Early Launch Anti-Malware Driver
+    platform: KMDF
+    language: cpp
+    category: Security
+    description: Demonstrates how to receive notifications about the initialization of regular boot start drivers in an Early Launch Anti-Malware driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617954
+--->
+
+
 Early Launch Anti-Malware Driver
 ================================
 
diff --git a/serial/VirtualSerial/README.md b/serial/VirtualSerial/README.md
index 2b1bc5130..59d9afb6c 100644
--- a/serial/VirtualSerial/README.md
+++ b/serial/VirtualSerial/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Virtual serial driver sample
+    platform: UDMF1
+    language: cpp
+    category: Serial
+    description: Demonstrates a simple virtual serial driver (ComPort) and a controller-less modem driver (FakeModem).
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617963
+--->
+
+
 Virtual serial driver sample
 ============================
 
diff --git a/serial/VirtualSerial2/README.md b/serial/VirtualSerial2/README.md
index 3c5baf787..81405d158 100644
--- a/serial/VirtualSerial2/README.md
+++ b/serial/VirtualSerial2/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Virtual serial driver sample (UMDF version 2)
+    platform: UMDF2
+    language: cpp
+    category: Serial
+    description: Demonstrates UMDF version 2 serial drivers and includes a simple virtual serial driver (ComPort) and a controller-less modem driver (FakeModem).
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617965
+--->
+
+
 Virtual serial driver sample
 ============================
 
diff --git a/serial/serenum/README.md b/serial/serenum/README.md
index 7b28ae46c..c4690bbf1 100644
--- a/serial/serenum/README.md
+++ b/serial/serenum/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Serenum sample
+    platform: WDM
+    language: cpp
+    category: Serial
+    description: Enumerates Plug-n-Play RS-232 devices that are compliant with the current revision of Plug and Play External COM Device.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617961
+--->
+
+
 Serenum sample
 ==============
 
diff --git a/serial/serial/README.md b/serial/serial/README.md
index de76bfb37..583e9cae0 100644
--- a/serial/serial/README.md
+++ b/serial/serial/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Serial Port Driver
+    platform: KMDF
+    language: cpp
+    category: Serial
+    description: The Serial (16550-based RS-232) sample driver is a WDF version of the inbox Serial.sys driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617962
+--->
+
+
 Serial Port Driver
 ==================
 
diff --git a/setup/devcon/README.md b/setup/devcon/README.md
index b559f0f1a..60e797029 100644
--- a/setup/devcon/README.md
+++ b/setup/devcon/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Device Console (DevCon) Tool
+    platform: Tool
+    language: cpp
+    category: Setup
+    description: DevCon enables, disables, installs, configures, and removes devices on the local computer and displays detailed information about devices on local and remote computers.
+    samplefwlink: https://go.microsoft.com/fwlink/p/?linkid=856741
+--->
+
+
 Device Console (DevCon) Tool
 ============================
 
diff --git a/simbatt/README.md b/simbatt/README.md
index e52e7d40f..24332b56e 100644
--- a/simbatt/README.md
+++ b/simbatt/README.md
@@ -1,3 +1,13 @@
-SimBatt: Battery Battery Driver Sample
+<!---
+    name: Simulated Battery Driver Sample
+    platform: KMDF
+    language: cpp
+    category: Battery Power
+    description: Demonstrates a KMDF-based implementation of Windows battery driver interfaces.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620188
+--->
+
+
+SimBatt: Simulated Battery Driver Sample
 ======================================
 SimBatt is simulated battery device driver, this source code is intended to demonstrate implementation of Windows battery driver interfaces. This is a KMDF based sample. You may use this sample as a starting point to implement a battery miniport specific to your needs.
\ No newline at end of file
diff --git a/smartcrd/README.md b/smartcrd/README.md
index d9454735e..c3b5ca742 100644
--- a/smartcrd/README.md
+++ b/smartcrd/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: PCMCIA Smart Card Driver
+    platform: KMDF
+    language: cpp
+    category: SmartCard
+    description: Demonstrates how to write a KMDF driver for the SCM Microsystems PCMCIA smart card reader.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617968
+--->
+
+
 PCMCIA Smart Card Driver
 ========================
 
diff --git a/spb/SkeletonI2C/README.md b/spb/SkeletonI2C/README.md
index 4522af7cf..2e639a9da 100644
--- a/spb/SkeletonI2C/README.md
+++ b/spb/SkeletonI2C/README.md
@@ -1,5 +1,15 @@
+<!---
+    name: Skeleton I2C Sample Driver
+    platform: KMDF
+    language: cpp
+    category: SimplePeripheralBus
+    description: Demonstrates how to design a KMDF controller driver for Windows that conforms to the simple peripheral bus (SPB) device driver interface (DDI).
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617969
+--->
+
+
 Skeleton I2C Sample Driver
-=========================
+==========================
 
 The SkeletonI2C sample demonstrates how to design a KMDF controller driver for Windows that conforms to the [simple peripheral bus](http://msdn.microsoft.com/en-us/library/windows/hardware/hh450903) (SPB) device driver interface (DDI). SPB is an abstraction for low-speed serial buses (for example, I<sup>2</sup>C and SPI) that allows peripheral drivers to be developed for cross-platform use without any knowledge of the underlying bus hardware or device connections. While this sample implements an empty I<sup>2</sup>C driver, it could just as easily be the starting point for an SPI driver with only minor modifications.
 
diff --git a/spb/SpbTestTool/README.md b/spb/SpbTestTool/README.md
index d7c9eb2eb..fbee4e704 100644
--- a/spb/SpbTestTool/README.md
+++ b/spb/SpbTestTool/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: SpbTestTool sample
+    platform: KMDF
+    language: cpp
+    category: SimplePeripheralBus
+    description: Demonstrates how to open a handle to the SPB controller, use the SPB interface from a KMDF driver, and employ GPIO.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617970
+--->
+
+
 SpbTestTool
 ===========
 
diff --git a/storage/class/cdrom/README.md b/storage/class/cdrom/README.md
index 187ca63b5..92ddf79bf 100644
--- a/storage/class/cdrom/README.md
+++ b/storage/class/cdrom/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: CDROM Storage Class Driver
+    platform: KMDF
+    language: cpp
+    category: Storage
+    description: Provide access to CD, DVD and Blu-ray drives, supports Plug and Play, Power Management, and AutoRun (media change notification). 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617971
+--->
+
+
 CDROM Storage Class Driver
 ==========================
 
diff --git a/storage/class/classpnp/README.md b/storage/class/classpnp/README.md
index c3a893bae..ec3c0e9bc 100644
--- a/storage/class/classpnp/README.md
+++ b/storage/class/classpnp/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: ClassPnP Class Driver Library 
+    platform: WDM
+    language: cpp
+    category: Storage
+    description: A library storage class driver used by disk, CDROM, and the tape class drivers.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617978
+--->
+
+
 ClassPnP Storage Class Driver Library
 =====================================
 
diff --git a/storage/class/disk/README.md b/storage/class/disk/README.md
index 1acd4ed55..c40325476 100644
--- a/storage/class/disk/README.md
+++ b/storage/class/disk/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Disk Class Driver
+    platform: WDM
+    language: cpp
+    category: Storage
+    description: A class driver for disk devices.  
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617979
+--->
+
+
 Disk Class Driver
 =================
 
diff --git a/storage/filters/addfilter/README.md b/storage/filters/addfilter/README.md
index 3981aa20d..8d3084c4e 100644
--- a/storage/filters/addfilter/README.md
+++ b/storage/filters/addfilter/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: AddFilter Storage Filter Tool
+    platform: Application
+    language: cpp
+    category: Storage
+    description: A command-line application that adds and removes filter drivers for a given drive or volume.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617980
+--->
+
+
 AddFilter Storage Filter Tool
 =============================
 
diff --git a/storage/iscsi/README.md b/storage/iscsi/README.md
index 8bfb69825..320e12062 100644
--- a/storage/iscsi/README.md
+++ b/storage/iscsi/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: iSCSI WMI Client 
+    platform: WDM
+    language: cpp
+    category: Storage
+    description: A WMI iSCSI miniport that can be tested using the iSCSICLI.exe tool, the iSCSI Initiator Properties page, the WBEMTEST.exe tool, and customized WMI scripts. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617981
+--->
+
+
 iSCSI WMI Client
 ================
 
diff --git a/storage/miniports/lsi_u3/README.md b/storage/miniports/lsi_u3/README.md
index 2e7950ea9..2ca91c644 100644
--- a/storage/miniports/lsi_u3/README.md
+++ b/storage/miniports/lsi_u3/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: LSI_U3 StorPort Miniport Driver
+    platform: WDM
+    language: cpp
+    category: Storage
+    description: An adapter driver for use with Parallel SCSI Host Bus Adapters or on-motherboard solutions that use the LSI 53C1010 SCSI ASIC.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617982
+--->
+
+
 LSI\_U3 StorPort Miniport Driver
 ================================
 
diff --git a/storage/miniports/storahci/README.md b/storage/miniports/storahci/README.md
index 7705ebd5d..ed65a9ff6 100644
--- a/storage/miniports/storahci/README.md
+++ b/storage/miniports/storahci/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: StorAHCI StorPort Miniport   
+    platform: WDM
+    language: cpp
+    category: Storage
+    description: A sample Storport ACHI miniport driver.  
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617983
+--->
+
+
 StorAhci StorPort Miniport Driver
 =================================
 
diff --git a/storage/msdsm/README.md b/storage/msdsm/README.md
index d43f1b688..599dc9630 100644
--- a/storage/msdsm/README.md
+++ b/storage/msdsm/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Multipath I/O (MPIO) DSM Sample 
+    platform: WDM
+    language: cpp
+    category: Storage
+    description: Provides a sample for building vendor-specific device-specific modules (DSM), supports iSCSI and Fibre Channel devices.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620203
+--->
+
+
 Multipath I/O (MPIO) DSM Sample
 ===============================
 
diff --git a/storage/ramdisk/README.md b/storage/ramdisk/README.md
index 66e976911..83e0bae1d 100644
--- a/storage/ramdisk/README.md
+++ b/storage/ramdisk/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: RAMDisk Storage Driver Sample
+    platform: KMDF
+    language: cpp
+    category: Storage
+    description: Demonstrates how to write a RAM disk software-only function driver using KMDF.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617988
+--->
+
+
 RAMDisk Storage Driver Sample
 =============================
 
diff --git a/storage/sfloppy/README.md b/storage/sfloppy/README.md
index be7bd2118..a48c62306 100644
--- a/storage/sfloppy/README.md
+++ b/storage/sfloppy/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Super Floppy (sfloppy) Storage Class Driver
+    platform: WDM
+    language: cpp
+    category: Storage
+    description: A smaple class driver for Super Floppy disk drives.     
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617989
+--->
+
+
 Super Floppy (sfloppy) Storage Class Driver
 ===========================================
 
diff --git a/storage/tools/spti/README.md b/storage/tools/spti/README.md
index 0d9ad39a8..10037d01c 100644
--- a/storage/tools/spti/README.md
+++ b/storage/tools/spti/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: SCSI Pass-Through Interface Tool
+    platform: Application
+    language: cpp
+    category: Storage
+    description:  Demonstrates how to communicate with a SCSI device using pass-through IOCTLs in an application using DeviceIoControl API.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617990
+--->
+
+
 SCSI Pass-Through Interface Tool
 ================================