diff --git a/Bootloaders/CDC/BootloaderCDC.txt b/Bootloaders/CDC/BootloaderCDC.txt
index 4f48a6eac51dcc4397b4531324718bd0f6990a37..7bfacc3c47b2341e01a2aaca3fd7c89dbd7af207 100644
--- a/Bootloaders/CDC/BootloaderCDC.txt
+++ b/Bootloaders/CDC/BootloaderCDC.txt
@@ -64,9 +64,9 @@
  *
  *  <table>
  *   <tr>
- *    <td><b>Define Name:</b></td>
- *    <td><b>Location:</b></td>
- *    <td><b>Description:</b></td>
+ *    <td>
+ *     None
+ *    </td>
  *   </tr>
  *  </table>
  */
\ No newline at end of file
diff --git a/Bootloaders/TeensyHID/TeensyHID.txt b/Bootloaders/TeensyHID/TeensyHID.txt
index 40de928895bd2901c3fa55f7de07a3e638df754e..d102eacf2677d54c5335bf6fafaf8ca3668c0335 100644
--- a/Bootloaders/TeensyHID/TeensyHID.txt
+++ b/Bootloaders/TeensyHID/TeensyHID.txt
@@ -32,13 +32,13 @@
  *  </tr>
  *  <tr>
  *   <td><b>Relevant Standards:</b></td>
- *   <td>USBIF HID Class Standard</td>
- *   <td>Teensy Programming Protocol Details</td>
+ *   <td>USBIF HID Class Standard \n
+ *       Teensy Programming Protocol Specification</td>
  *  </tr>
  *  <tr>
  *   <td><b>Usable Speeds:</b></td>
- *   <td>Low Speed Mode</td>
- *   <td>Full Speed Mode</td>
+ *   <td>Low Speed Mode \n
+ *       Full Speed Mode</td>
  *  </tr>
  * </table>
  *
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
index 585faec1b584c97c2894de11187d5c9554743f2d..aedb4b7829a21ec0c9c197c696af1db26cf9a302 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
@@ -33,9 +33,9 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Audio Class Specification</td>
- *    <td>USBIF Audio Class Terminal Types Specification</td>
- *    <td>USBIF Audio Data Formats Specification</td>
+ *    <td>USBIF Audio Class Specification \n
+ *        USBIF Audio Class Terminal Types Specification \n
+ *        USBIF Audio Data Formats Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
index c305f9c9db2ba25b3c1d8102efce7b308716bd9a..b05ee45ce50fa08b3cd841a9cc6dfbe4dc988815 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
@@ -33,9 +33,9 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Audio Class Specification</td>
- *    <td>USBIF Audio Class Terminal Types Specification</td>
- *    <td>USBIF Audio Data Formats Specification</td>
+ *    <td>USBIF Audio Class Specification \n
+ *        USBIF Audio Class Terminal Types Specification \n
+ *        USBIF Audio Data Formats Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.txt b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.txt
index 761769e3cdbea9e793556f0ab1342b153f745e61..40b7c5a85aa0d35a629c331e17618726f618ce5b 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.txt
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.txt
@@ -26,20 +26,22 @@
  *   </tr>
  *   <tr>
  *    <td><b>USB Class:</b></td>
- *    <td>Miscellaneous Device Class</td>
- *    <td>( Sub-Interface: Communications Device Class (CDC) )</td>
+ *    <td>Communications Device Class (CDC)</td>
  *   </tr>
  *   <tr> 
  *    <td><b>USB Subclass:</b></td>
- *    <td>Common Class</td> 
- *    <td>( Sub-Interface: Abstract Control Model (ACM) )</td>
+ *    <td>Abstract Control Model (ACM)</td>
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Interface Association Descriptor ECN</td>
  *    <td>USBIF CDC Class Standard</td>
  *   </tr>
  *   <tr>
+ *    <td><b>Relevant Standards:</b></td>
+ *    <td>USBIF Interface Association Descriptor ECN \n
+ *        USBIF CDC Class Standard</td>
+ *   </tr>
+ *   <tr>
  *    <td><b>Usable Speeds:</b></td>
  *    <td>Full Speed Mode</td>
  *   </tr>
diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.txt b/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
index f8176e69fba30b073c220192ac53d783fbdc8807..fe46abdfc02455f5ff003cd72e50bd51b21ea392 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.txt b/Demos/Device/ClassDriver/Joystick/Joystick.txt
index 4584cf964fd9099d6fd1e0ca5c5ad6bb372867c6..51c9bdbc74fa135ed815fa4c882f84811b713d12 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.txt
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.txt b/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
index 89dde830522252ad127873b97284beca966be983..b7171e570927ce7282ea5f91d661e84c0d90181b 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
index 0d4f8113ee3291089692ef1658a1e5179dfa8cc0..f1a4c509bb677e8b5e8cb683ea9e3d9a42bc12d6 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.txt b/Demos/Device/ClassDriver/MIDI/MIDI.txt
index 7f68e5b8715c79b1b90bd61442a44b84b73f0f54..7fbfd171a4abc8b56efdcecb04598b7966eee2b6 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.txt
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.txt
@@ -34,9 +34,9 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Audio Class Specification</td>
- *    <td>USB-MIDI Audio Class Extension Specification</td>
- *    <td>General MIDI Specification</td>
+ *    <td>USBIF Audio Class Specification \n
+ *        USB-MIDI Audio Class Extension Specification \n
+ *        General MIDI Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
index 6b0a32733533ac5b1b9ffdcff7f8698caf4e55fe..7f4a83b9fcb857690522cf5452837badbc52dbf5 100644
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
@@ -34,10 +34,10 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Mass Storage Standard</td>
- *    <td>USB Bulk-Only Transport Standard</td>
- *    <td>SCSI Primary Commands Specification</td>
- *    <td>SCSI Block Commands Specification</td>
+ *    <td>USBIF Mass Storage Standard \n
+ *        USB Bulk-Only Transport Standard \n
+ *        SCSI Primary Commands Specification \n
+ *        SCSI Block Commands Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
index bed44f81debf32e794ef0d1b759da73a107bee5c..590d35705ddc4e328a8a24badefccbc7482b7568 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
@@ -26,21 +26,22 @@
  *   </tr>
  *   <tr>
  *    <td><b>USB Classes:</b></td>
- *    <td>Mass Storage Device</td>
- *    <td>Human Interface Device</td>
+ *    <td>Mass Storage Device \n
+ *        Human Interface Device</td>
  *   </tr>
  *   <tr> 
  *    <td><b>USB Subclasses:</b></td>
- *    <td>Bulk-Only Transport</td>
- *    <td>Keyboard Subclass</td>
+ *    <td>Bulk-Only Transport \n
+ *        Keyboard Subclass</td>
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Mass Storage Standard</td>
- *    <td>USB Bulk-Only Transport Standard</td>
- *    <td>SCSI Primary Commands Specification</td>
- *    <td>SCSI Block Commands Specification</td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF Mass Storage Standard \n
+ *        USB Bulk-Only Transport Standard \n
+ *        SCSI Primary Commands Specification \n
+ *        SCSI Block Commands Specification \n
+ *        USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.txt b/Demos/Device/ClassDriver/Mouse/Mouse.txt
index 4d55bbf2bd7557c2273186a9317e58bb20d7ca21..e0cf4079522b788789450560f29c734740f73340 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.txt
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.txt b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.txt
index ff0d8a361aacd569d7d7ae2b75df3b13ca00c89b..8ffe4d7445654becd04a0a8263e7e8c9104d7e34 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.txt
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.txt
@@ -26,18 +26,19 @@
  *   </tr>
  *   <tr>
  *    <td><b>USB Class:</b></td>
- *    <td>Communications Device Class (CDC)</td>
- *    <td>Human Interface Device Class (HID)</td>
+ *    <td>Communications Device Class (CDC) \n
+ *        Human Interface Device Class (HID)</td>
  *   </tr>
  *   <tr> 
  *    <td><b>USB Subclass:</b></td>
- *    <td>Abstract Control Model (ACM)</td>
- *    <td>Mouse Subclass</td>
+ *    <td>Abstract Control Model (ACM) \n
+ *        Mouse Subclass</td>
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
  *    <td>USBIF CDC Class Standard</td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.txt b/Demos/Device/LowLevel/AudioInput/AudioInput.txt
index b36892d7a554ad757f83482cca4b1765879ebcdf..4601077b04d61c72c45d31580b700976b18c3533 100644
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.txt
+++ b/Demos/Device/LowLevel/AudioInput/AudioInput.txt
@@ -33,9 +33,9 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Audio Class Specification</td>
- *    <td>USBIF Audio Class Terminal Types Specification</td>
- *    <td>USBIF Audio Data Formats Specification</td>
+ *    <td>USBIF Audio Class Specification \n
+ *        USBIF Audio Class Terminal Types Specification \n
+ *        USBIF Audio Data Formats Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
index c305f9c9db2ba25b3c1d8102efce7b308716bd9a..b05ee45ce50fa08b3cd841a9cc6dfbe4dc988815 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
@@ -33,9 +33,9 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Audio Class Specification</td>
- *    <td>USBIF Audio Class Terminal Types Specification</td>
- *    <td>USBIF Audio Data Formats Specification</td>
+ *    <td>USBIF Audio Class Specification \n
+ *        USBIF Audio Class Terminal Types Specification \n
+ *        USBIF Audio Data Formats Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.txt b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.txt
index 761769e3cdbea9e793556f0ab1342b153f745e61..40b7c5a85aa0d35a629c331e17618726f618ce5b 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.txt
+++ b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.txt
@@ -26,20 +26,22 @@
  *   </tr>
  *   <tr>
  *    <td><b>USB Class:</b></td>
- *    <td>Miscellaneous Device Class</td>
- *    <td>( Sub-Interface: Communications Device Class (CDC) )</td>
+ *    <td>Communications Device Class (CDC)</td>
  *   </tr>
  *   <tr> 
  *    <td><b>USB Subclass:</b></td>
- *    <td>Common Class</td> 
- *    <td>( Sub-Interface: Abstract Control Model (ACM) )</td>
+ *    <td>Abstract Control Model (ACM)</td>
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Interface Association Descriptor ECN</td>
  *    <td>USBIF CDC Class Standard</td>
  *   </tr>
  *   <tr>
+ *    <td><b>Relevant Standards:</b></td>
+ *    <td>USBIF Interface Association Descriptor ECN \n
+ *        USBIF CDC Class Standard</td>
+ *   </tr>
+ *   <tr>
  *    <td><b>Usable Speeds:</b></td>
  *    <td>Full Speed Mode</td>
  *   </tr>
diff --git a/Demos/Device/LowLevel/GenericHID/GenericHID.txt b/Demos/Device/LowLevel/GenericHID/GenericHID.txt
index f8176e69fba30b073c220192ac53d783fbdc8807..fe46abdfc02455f5ff003cd72e50bd51b21ea392 100644
--- a/Demos/Device/LowLevel/GenericHID/GenericHID.txt
+++ b/Demos/Device/LowLevel/GenericHID/GenericHID.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/LowLevel/Joystick/Joystick.txt b/Demos/Device/LowLevel/Joystick/Joystick.txt
index 4584cf964fd9099d6fd1e0ca5c5ad6bb372867c6..51c9bdbc74fa135ed815fa4c882f84811b713d12 100644
--- a/Demos/Device/LowLevel/Joystick/Joystick.txt
+++ b/Demos/Device/LowLevel/Joystick/Joystick.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.txt b/Demos/Device/LowLevel/Keyboard/Keyboard.txt
index 2bdaa6cc3714f91c48f336da8c3b988e9dd61b81..fb6ffefa3de2676ad65b425d8740ca8a13b4335d 100644
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.txt
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
index 0d4f8113ee3291089692ef1658a1e5179dfa8cc0..f1a4c509bb677e8b5e8cb683ea9e3d9a42bc12d6 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Device/LowLevel/MIDI/MIDI.txt b/Demos/Device/LowLevel/MIDI/MIDI.txt
index 7f68e5b8715c79b1b90bd61442a44b84b73f0f54..7fbfd171a4abc8b56efdcecb04598b7966eee2b6 100644
--- a/Demos/Device/LowLevel/MIDI/MIDI.txt
+++ b/Demos/Device/LowLevel/MIDI/MIDI.txt
@@ -34,9 +34,9 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Audio Class Specification</td>
- *    <td>USB-MIDI Audio Class Extension Specification</td>
- *    <td>General MIDI Specification</td>
+ *    <td>USBIF Audio Class Specification \n
+ *        USB-MIDI Audio Class Extension Specification \n
+ *        General MIDI Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.txt b/Demos/Device/LowLevel/MassStorage/MassStorage.txt
index 6b0a32733533ac5b1b9ffdcff7f8698caf4e55fe..7f4a83b9fcb857690522cf5452837badbc52dbf5 100644
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.txt
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.txt
@@ -34,10 +34,10 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Mass Storage Standard</td>
- *    <td>USB Bulk-Only Transport Standard</td>
- *    <td>SCSI Primary Commands Specification</td>
- *    <td>SCSI Block Commands Specification</td>
+ *    <td>USBIF Mass Storage Standard \n
+ *        USB Bulk-Only Transport Standard \n
+ *        SCSI Primary Commands Specification \n
+ *        SCSI Block Commands Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Device/LowLevel/Mouse/Mouse.txt b/Demos/Device/LowLevel/Mouse/Mouse.txt
index 15ab39b0e24f3c85207267c6960d7af39e1c7661..1e88e42c09659b6a21c6c27ed1393dacbd13b42c 100644
--- a/Demos/Device/LowLevel/Mouse/Mouse.txt
+++ b/Demos/Device/LowLevel/Mouse/Mouse.txt
@@ -34,11 +34,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.txt b/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.txt
index 581905daf26b72fdb66f95c44fe958e5f8bb4218..f65931185d3f2592cf78273313664ed2c185571c 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.txt
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.txt
@@ -19,7 +19,7 @@
  *  <table>
  *   <tr>
  *    <td><b>USB Mode:</b></td>
- *    <td>Host/Device</td>
+ *    <td>Dual Mode Host/Device</td>
  *   </tr>
  *   <tr>
  *    <td><b>USB Class:</b></td>
diff --git a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.txt b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.txt
index 4d5888937554662bb4cf2c83b8fd2c9acc0932d7..3a24de07bd8be3c73f073ddc033f5aa984651dbb 100644
--- a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.txt
+++ b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.txt b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.txt
index b7d56c025279a4df017afbf838bfb66ba42579b9..3fbe1b4e7fa9b3cf4c7f22fb60ffc04e65b2eda2 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.txt
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.txt b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.txt
index 8dd5d9dd61e1396b3fd177052f67636f0438c72b..bb494cfbe58f1d66da35930618f200119b6e8ede 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.txt
+++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.txt
@@ -31,10 +31,10 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Mass Storage Standard</td>
- *    <td>USB Bulk-Only Transport Standard</td>
- *    <td>SCSI Primary Commands Specification</td>
- *    <td>SCSI Block Commands Specification</td>
+ *    <td>USBIF Mass Storage Standard \n
+ *        USB Bulk-Only Transport Standard \n
+ *        SCSI Primary Commands Specification \n
+ *        SCSI Block Commands Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.txt b/Demos/Host/ClassDriver/MouseHost/MouseHost.txt
index bcbd057830f6739577e168c747a74ba62dbaf858..afe948fd94b39a2097a767639c59307958f28cd6 100644
--- a/Demos/Host/ClassDriver/MouseHost/MouseHost.txt
+++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.txt b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.txt
index a6f05ac406f404c60ddb465eebebb8d8d4de3c9d..3eec2a57deb30ac6dbc806155b2c2387b0f10d80 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.txt
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/ClassDriver/PrinterHost/PrinterHost.txt b/Demos/Host/ClassDriver/PrinterHost/PrinterHost.txt
index 484241df2814a4ccf0a2c6102e7eece16fd7ce0d..c31fc95500fe8fe1164eab712ac2f8ea335199e3 100644
--- a/Demos/Host/ClassDriver/PrinterHost/PrinterHost.txt
+++ b/Demos/Host/ClassDriver/PrinterHost/PrinterHost.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Printer Class Specification, PCL Language Specification</td>
+ *    <td>USBIF Printer Class Specification \n
+ *        PCL Language Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.txt b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.txt
index 71a4256899829f611d77ada0b0a782ae4a2aed04..10a99e11124547743115c4e253ebfbe4edf8bb7d 100644
--- a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.txt
+++ b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.txt
@@ -31,8 +31,8 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Still Image Class Specification</td>
- *    <td>PIMA 15740 Specification</td>
+ *    <td>USBIF Still Image Class Specification \n
+ *        PIMA 15740 Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
index 6a17fc5838b57a5e4817b356bd77d4bf5df39204..1495558d60d93617676ddf4fbfe126de2b03d45b 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.txt b/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.txt
index 4d5888937554662bb4cf2c83b8fd2c9acc0932d7..3a24de07bd8be3c73f073ddc033f5aa984651dbb 100644
--- a/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.txt
+++ b/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
index 10406ec26f9101099f84090637e85a647e99243c..c19620fc9599b25cd5f9fbcc24fb82d768773f49 100644
--- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
+++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
index b7d56c025279a4df017afbf838bfb66ba42579b9..3fbe1b4e7fa9b3cf4c7f22fb60ffc04e65b2eda2 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
index 8dd5d9dd61e1396b3fd177052f67636f0438c72b..bb494cfbe58f1d66da35930618f200119b6e8ede 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
@@ -31,10 +31,10 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Mass Storage Standard</td>
- *    <td>USB Bulk-Only Transport Standard</td>
- *    <td>SCSI Primary Commands Specification</td>
- *    <td>SCSI Block Commands Specification</td>
+ *    <td>USBIF Mass Storage Standard \n
+ *        USB Bulk-Only Transport Standard \n
+ *        SCSI Primary Commands Specification \n
+ *        SCSI Block Commands Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.txt b/Demos/Host/LowLevel/MouseHost/MouseHost.txt
index bcbd057830f6739577e168c747a74ba62dbaf858..afe948fd94b39a2097a767639c59307958f28cd6 100644
--- a/Demos/Host/LowLevel/MouseHost/MouseHost.txt
+++ b/Demos/Host/LowLevel/MouseHost/MouseHost.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
index a6f05ac406f404c60ddb465eebebb8d8d4de3c9d..3eec2a57deb30ac6dbc806155b2c2387b0f10d80 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
+++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
@@ -31,11 +31,13 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF HID Specification \n
+ *        USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *   </tr>
  *  </table>
  *
diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.txt b/Demos/Host/LowLevel/PrinterHost/PrinterHost.txt
index 484241df2814a4ccf0a2c6102e7eece16fd7ce0d..552a8782820409fd32d3fed96c9fff64a4f8c56d 100644
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.txt
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.txt
@@ -31,12 +31,11 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Printer Class Specification, PCL Language Specification</td>
- *   </tr>
- *   <tr>
- *    <td><b>Usable Speeds:</b></td>
- *    <td>Low Speed Mode, Full Speed Mode</td>
+ *    <td>USBIF Printer Class Specification \n
+ *        PCL Language Specification</td>
  *   </tr>
+ *    <td>Low Speed Mode \n
+ *        Full Speed Mode</td>
  *  </table>
  *
  *  \section SSec_Description Project Description: 
diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt b/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
index 71a4256899829f611d77ada0b0a782ae4a2aed04..10a99e11124547743115c4e253ebfbe4edf8bb7d 100644
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
@@ -31,8 +31,8 @@
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Still Image Class Specification</td>
- *    <td>PIMA 15740 Specification</td>
+ *    <td>USBIF Still Image Class Specification \n
+ *        PIMA 15740 Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/LUFA/ManPages/LibraryApps.txt b/LUFA/ManPages/LibraryApps.txt
index 3edf25f4389540008d56dbe2940007e8145a5bf9..63e89b9470e3534059fedd89e9c404101fe004da 100644
--- a/LUFA/ManPages/LibraryApps.txt
+++ b/LUFA/ManPages/LibraryApps.txt
@@ -103,9 +103,9 @@
  *    - <b>LEDNotifier</b> - USB LED Notification project
  *    - <b>Magstripe</b> - Magnetic Stripe Card Reader project
  *    - <b>MissileLaucher</b> - Toy Missile Launcher Host project
- *    - <b>TemperatureDataLogger</b> - Temperature Datalogging project
+ *    - <b>TemperatureDataLogger</b> - Temperature Datalogging project, using the FatFS library
  *    - <b>USBtoSerial</b> - USB to USART Serial Converter project
- *    - <b>Webserver</b> - RNDIS Host Webserver, powered by uIP TCP/IP stack project
+ *    - <b>Webserver</b> - RNDIS Host Webserver with DHCP client, powered by uIP TCP/IP stack project and FatFS library
  *    - <b>XPLAINBridge</b> - XPLAIN alternative PDI Programmer/USB to Serial Bridge firmware project
  *
  *  </small>
diff --git a/Projects/Benito/Benito.txt b/Projects/Benito/Benito.txt
index 248ca77632c5580834536faba67027baf963a780..1461d6dc0688e1725d6c85b2f49c8484cfc4bdfc 100644
--- a/Projects/Benito/Benito.txt
+++ b/Projects/Benito/Benito.txt
@@ -34,8 +34,8 @@
  *  </tr>
  *  <tr>
  *   <td><b>Relevant Standards:</b></td>
- *   <td>USBIF CDC Class Standard</td>
- *   <td>Arduino Bootloader Specification</td>
+ *   <td>USBIF CDC Class Standard \n
+ *       Arduino Bootloader Specification</td>
  *  </tr>
  *  <tr>
  *   <td><b>Usable Speeds:</b></td>
diff --git a/Projects/TemperatureDataLogger/TemperatureDataLogger.txt b/Projects/TemperatureDataLogger/TemperatureDataLogger.txt
index f4eb30c087d2a6b8e89d9fe61a6c6703bb515fe8..280c5fe02da613362d31e0f0cd36faa65b450fa3 100644
--- a/Projects/TemperatureDataLogger/TemperatureDataLogger.txt
+++ b/Projects/TemperatureDataLogger/TemperatureDataLogger.txt
@@ -25,21 +25,21 @@
  *   </tr>
  *   <tr>
  *    <td><b>USB Classes:</b></td>
- *    <td>Mass Storage Device</td>
- *    <td>Human Interface Device</td>
+ *    <td>Mass Storage Device \n
+ *        Human Interface Device</td>
  *   </tr>
  *   <tr> 
  *    <td><b>USB Subclasses:</b></td>
- *    <td>Bulk-Only Transport</td>
- *    <td>Keyboard Subclass</td>
+ *    <td>Bulk-Only Transport \n
+ *        Keyboard Subclass</td>
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Mass Storage Standard</td>
- *    <td>USB Bulk-Only Transport Standard</td>
- *    <td>SCSI Primary Commands Specification</td>
- *    <td>SCSI Block Commands Specification</td>
- *    <td>USBIF HID Specification, USBIF HID Usage Tables</td>
+ *    <td>USBIF Mass Storage Standard \n
+ *        USB Bulk-Only Transport Standard \n
+ *        SCSI Primary Commands Specification \n
+ *        SCSI Block Commands Specification \n
+ *        USBIF HID Specification, USBIF HID Usage Tables</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
diff --git a/Projects/Webserver/Descriptors.c b/Projects/Webserver/Descriptors.c
index 40ce620a64f295cc080097cc00edb7ede78331cb..855bbd3f81e6d2cb6d94e908f0edae6bcdb8e9f7 100644
--- a/Projects/Webserver/Descriptors.c
+++ b/Projects/Webserver/Descriptors.c
@@ -163,9 +163,9 @@ USB_Descriptor_String_t PROGMEM ManufacturerString =
  */
 USB_Descriptor_String_t PROGMEM ProductString =
 {
-	.Header                 = {.Size = USB_STRING_LEN(22), .Type = DTYPE_String},
+	.Header                 = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},
 		
-	.UnicodeString          = L"LUFA Mass Storage Demo"
+	.UnicodeString          = L"LUFA Webserver"
 };
 
 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
diff --git a/Projects/Webserver/Lib/FATFs/diskio.lst b/Projects/Webserver/Lib/FATFs/diskio.lst
index d3e78054bffe7661af3c3119bd5072b7622cd175..6553e4d2c1a878f009d7898f6a335563e045a588 100644
--- a/Projects/Webserver/Lib/FATFs/diskio.lst
+++ b/Projects/Webserver/Lib/FATFs/diskio.lst
@@ -131,18 +131,18 @@
  214               	.Letext0:
 DEFINED SYMBOLS
                             *ABS*:00000000 diskio.c
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:2      *ABS*:0000003f __SREG__
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:3      *ABS*:0000003e __SP_H__
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:4      *ABS*:0000003d __SP_L__
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:5      *ABS*:00000034 __CCP__
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:6      *ABS*:00000000 __tmp_reg__
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:7      *ABS*:00000001 __zero_reg__
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:19     .text.disk_initialize:00000000 disk_initialize
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:35     .text.disk_status:00000000 disk_status
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:51     .text.disk_ioctl:00000000 disk_ioctl
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:74     .text.get_fattime:00000000 get_fattime
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:91     .text.disk_write:00000000 disk_write
-C:\Users\Dean\AppData\Local\Temp/cc5TUdwu.s:122    .text.disk_read:00000000 disk_read
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:2      *ABS*:0000003f __SREG__
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:3      *ABS*:0000003e __SP_H__
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:4      *ABS*:0000003d __SP_L__
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:5      *ABS*:00000034 __CCP__
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:6      *ABS*:00000000 __tmp_reg__
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:7      *ABS*:00000001 __zero_reg__
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:19     .text.disk_initialize:00000000 disk_initialize
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:35     .text.disk_status:00000000 disk_status
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:51     .text.disk_ioctl:00000000 disk_ioctl
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:74     .text.get_fattime:00000000 get_fattime
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:91     .text.disk_write:00000000 disk_write
+C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:122    .text.disk_read:00000000 disk_read
 
 UNDEFINED SYMBOLS
 DataflashManager_WriteBlocks_RAM
diff --git a/Projects/Webserver/Lib/FATFs/ff.lst b/Projects/Webserver/Lib/FATFs/ff.lst
index 2a8f9fc4ede096b7ed8088a0a22b8cbd31fb697a..75598c4e6298440c55ad4a48e12247717e0c9df6 100644
--- a/Projects/Webserver/Lib/FATFs/ff.lst
+++ b/Projects/Webserver/Lib/FATFs/ff.lst
@@ -3031,26 +3031,26 @@
  3172               	.Letext0:
 DEFINED SYMBOLS
                             *ABS*:00000000 ff.c
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:2      *ABS*:0000003f __SREG__
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:3      *ABS*:0000003e __SP_H__
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:4      *ABS*:0000003d __SP_L__
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:5      *ABS*:00000034 __CCP__
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:6      *ABS*:00000000 __tmp_reg__
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:7      *ABS*:00000001 __zero_reg__
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:19     .text.clust2sect:00000000 clust2sect
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:101    .text.f_mount:00000000 f_mount
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:2      *ABS*:0000003f __SREG__
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:3      *ABS*:0000003e __SP_H__
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:4      *ABS*:0000003d __SP_L__
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:5      *ABS*:00000034 __CCP__
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:6      *ABS*:00000000 __tmp_reg__
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:7      *ABS*:00000001 __zero_reg__
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:19     .text.clust2sect:00000000 clust2sect
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:101    .text.f_mount:00000000 f_mount
                              .bss:00000000 FatFs
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:144    .text.validate:00000000 validate
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:184    .text.f_close:00000000 f_close
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:218    .text.move_window:00000000 move_window
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:292    .text.get_fat:00000000 get_fat
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:545    .text.f_lseek:00000000 f_lseek
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:1021   .text.dir_seek:00000000 dir_seek
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:1270   .text.f_read:00000000 f_read
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:1694   .text.check_fs:00000000 check_fs
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:1779   .text.chk_mounted:00000000 chk_mounted
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:3058   .bss:00000002 Fsid
-C:\Users\Dean\AppData\Local\Temp/cchqutwM.s:2194   .text.f_open:00000000 f_open
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:144    .text.validate:00000000 validate
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:184    .text.f_close:00000000 f_close
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:218    .text.move_window:00000000 move_window
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:292    .text.get_fat:00000000 get_fat
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:545    .text.f_lseek:00000000 f_lseek
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:1021   .text.dir_seek:00000000 dir_seek
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:1270   .text.f_read:00000000 f_read
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:1694   .text.check_fs:00000000 check_fs
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:1779   .text.chk_mounted:00000000 chk_mounted
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:3058   .bss:00000002 Fsid
+C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:2194   .text.f_open:00000000 f_open
 
 UNDEFINED SYMBOLS
 __mulsi3
diff --git a/Projects/Webserver/Webserver.txt b/Projects/Webserver/Webserver.txt
index e78cf5effd9171cbb87d4ebead94ff9d87813f41..f13c17f5b507c3db6b93018c34eb1468e117c037 100644
--- a/Projects/Webserver/Webserver.txt
+++ b/Projects/Webserver/Webserver.txt
@@ -19,19 +19,25 @@
  *  <table>
  *   <tr>
  *    <td><b>USB Mode:</b></td>
- *    <td>Host</td>
+ *    <td>Dual Mode Host/Device</td>
  *   </tr>
  *   <tr>
  *    <td><b>USB Class:</b></td>
- *    <td>Communications Device Class (CDC)</td>
+ *    <td>Communications Device Class (CDC) \n
+ *        Mass Storage Device</td>
  *   </tr>
  *   <tr> 
  *    <td><b>USB Subclass:</b></td>
- *    <td>Remote NDIS (Microsoft Proprietary CDC Class Networking Standard)</td>
+ *    <td>Remote NDIS (Microsoft Proprietary CDC Class Networking Standard) \n
+ *        Bulk-Only Transport</td>
  *   </tr>
  *   <tr>
  *    <td><b>Relevant Standards:</b></td>
- *    <td>Microsoft RNDIS Specification</td>
+ *    <td>Microsoft RNDIS Specification \n
+ *        USBIF Mass Storage Standard \n
+ *        USB Bulk-Only Transport Standard \n
+ *        SCSI Primary Commands Specification \n
+ *        SCSI Block Commands Specification</td>
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
@@ -48,12 +54,12 @@
  *
  *  To use this project, plug the USB AVR into a computer, so that it enumerates as a standard Mass Storage device. Load
  *  HTML files onto the disk, so that they can be served out to clients -- the default file to serve should be called
- *  <i>index.htm<i>. Filenames must be in 8.3 format for them to be retrieved correctly by the webserver.
- 
- *  When attached to a RNDIS class device, such as a USB (desktop) modem. If compatible, the system will enumerate the
- *  device, set the appropriate parameters needed for connectivity and begin listening for new HTTP connections on port 80.
- *  The device IP, netmask and default gateway IP must be set to values appropriate for the RNDIS device being used for this
- *  project to work, if the DHCP client is disabled (see \ref SSec_Options).
+ *  <i>index.htm</i>. Filenames must be in 8.3 format for them to be retrieved correctly by the webserver.
+ *
+ *  When attached to a RNDIS class device, such as a USB (desktop) modem, the system will enumerate the device, set the
+ *  appropriate parameters needed for connectivity and begin listening for new HTTP connections on port 80. The device IP,
+ *  netmask and default gateway IP must be set to values appropriate for the RNDIS device being used for this project to 
+ *  work, if the DHCP client is disabled (see \ref SSec_Options).
  *
  *  When properly configured, the webserver can be accessed from any HTTP webrowser by typing in the device's static or
  *  dynamically allocated IP address.
diff --git a/Projects/XPLAINBridge/XPLAINBridge.txt b/Projects/XPLAINBridge/XPLAINBridge.txt
index 98d6dfe6eba1f7d68bec0894a69b040b2055ca0e..a117560db9e99b5569fbbef92359ccb6dbfae633 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.txt
+++ b/Projects/XPLAINBridge/XPLAINBridge.txt
@@ -19,8 +19,8 @@
  *  <table>
  *   <tr>
  *    <td><b>USB Mode:</b></td>
- *    <td>Device</td>
- *    <td>Device</td>
+ *    <td>1) Device</td>
+ *    <td>2) Device</td>
  *   </tr>
  *   <tr>
  *    <td><b>USB Class:</b></td>
@@ -39,8 +39,8 @@
  *   </tr>
  *   <tr>
  *    <td><b>Usable Speeds:</b></td>
- *    <td>Full Speed Mode</td>
- *    <td>Full Speed Mode</td>
+ *    <td>1) Full Speed Mode</td>
+ *    <td>2) Full Speed Mode</td>
  *   </tr>
  *  </table>
  *