diff --git a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
index 0d57efaabb6..8cb4ea9a8d9 100644
--- a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
+++ b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
@@ -49,7 +49,7 @@
 
 	<!-- Update the extension online help URLs to the version of LUFA being
 	     used -->
-	<xsl:template match="online-help/*/@baseurl | online-help/index-page/@url">
+	<xsl:template match="online-help/*/@baseurl">
 		<xsl:attribute name="baseurl">
 			<xsl:value-of select="current()"/>
 			<xsl:value-of select="$lufa-version"/>
@@ -57,4 +57,12 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:template match="online-help/index-page/@url">
+		<xsl:attribute name="url">
+			<xsl:value-of select="current()"/>
+			<xsl:value-of select="$lufa-version"/>
+			<xsl:text>/html/</xsl:text>
+		</xsl:attribute>
+	</xsl:template>
+
 </xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml
index 035c8c64032..8bac108ed64 100644
--- a/LUFA/StudioIntegration/lufa_drivers_board.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -77,13 +77,13 @@
 		</module>
 
 		<select-by-config id="lufa.drivers.board" name="lufa.drivers.board.name" default="none" caption="LUFA Board Support">
-			<module id="lufa.drivers.board#none" name="None">
+			<module type="driver" id="lufa.drivers.board#none" caption="None">
 				<device-support value="avr"/>
 
 				<build type="define" name="BOARD" value="BOARD_NONE"/>
 			</module>
 
-			<module id="lufa.drivers.board#usbkey" name="USBKEY">
+			<module type="driver" id="lufa.drivers.board#usbkey" caption="USBKEY">
 				<device-support value="at90usb1287"/>
 
 				<require idref="lufa.drivers.misc.at45db642d"/>
@@ -96,7 +96,7 @@
 				<build type="define" name="BOARD" value="BOARD_USBKEY"/>
 			</module>
 
-			<module id="lufa.drivers.board#xplain_rev1" name="XPLAIN (HW Rev 1)">
+			<module type="driver" id="lufa.drivers.board#xplain_rev1" caption="XPLAIN (HW Rev 1)">
 				<device-support value="at90usb1287"/>
 
 				<require idref="lufa.drivers.misc.at45db642d"/>
@@ -107,7 +107,7 @@
 				<build type="define" name="BOARD" value="BOARD_XPLAIN_REV1"/>
 			</module>
 
-			<module id="lufa.drivers.board#xplain" name="XPLAIN (HW Rev 2+)">
+			<module type="driver" id="lufa.drivers.board#xplain" caption="XPLAIN (HW Rev 2+)">
 				<device-support value="at90usb1287"/>
 
 				<require idref="lufa.drivers.misc.at45db642d"/>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
index 7aba9408180..865f59e20ae 100644
--- a/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
@@ -18,6 +18,7 @@
 			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c"/>
 			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c"/>
 			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c"/>
 			<build type="c-source"    value="Drivers/USB/Core/AVR8/Device_AVR8.c"/>
 			<build type="header-file" value="Drivers/USB/Core/AVR8/Device_AVR8.h"/>
 			<build type="c-source"    value="Drivers/USB/Core/AVR8/Endpoint_AVR8.c"/>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
index f2378373585..00e04958231 100644
--- a/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
@@ -18,6 +18,7 @@
 			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c"/>
 			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c"/>
 			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c"/>
 			<build type="c-source"    value="Drivers/USB/Core/UC3/Device_UC3.c"/>
 			<build type="header-file" value="Drivers/USB/Core/UC3/Device_UC3.h"/>
 			<build type="c-source"    value="Drivers/USB/Core/UC3/Endpoint_UC3.c"/>