diff --git a/Bootloaders/DFU/BootloaderDFU.aps b/Bootloaders/DFU/BootloaderDFU.aps
index 995c02d3e7..f0fe31b9e3 100644
--- a/Bootloaders/DFU/BootloaderDFU.aps
+++ b/Bootloaders/DFU/BootloaderDFU.aps
@@ -1 +1 @@
-BootloaderDFU13-Jul-2010 14:42:2813-Jul-2010 14:42:48241013-Jul-2010 14:42:2844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Bootloaders\DFU\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000BootloaderDFU.cDescriptors.cBootloaderDFU.hDescriptors.hmakefiledefaultYESmakefileatmega12811
BootloaderDFU.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
+BootloaderDFU13-Jul-2010 14:42:2813-Jul-2010 14:46:54241013-Jul-2010 14:42:2844, 18, 0, 685AVR GCCBootloaderDFU.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Bootloaders\DFU\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000BootloaderDFU.cDescriptors.cBootloaderDFU.hDescriptors.hmakefiledefaultYESmakefileatmega12811
BootloaderDFU.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.aps b/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.aps
new file mode 100644
index 0000000000..95cafbe4fd
--- /dev/null
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.aps
@@ -0,0 +1 @@
+MouseHostDevice13-Jul-2010 14:47:1313-Jul-2010 14:47:59241013-Jul-2010 14:47:1344, 18, 0, 685AVR GCCMouseHostDevice.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\DualRole\ClassDriver\MouseHostDevice\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000Descriptors.cDeviceFunctions.cHostFunctions.cMouseHostDevice.cDescriptors.hDeviceFunctions.hHostFunctions.hMouseHostDevice.hmakefiledefaultYESmakefileatmega12811
MouseHostDevice.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.aps b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.aps
new file mode 100644
index 0000000000..9cc9fd2cf7
--- /dev/null
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.aps
@@ -0,0 +1 @@
+GenericHIDHost13-Jul-2010 14:48:2513-Jul-2010 14:48:52241013-Jul-2010 14:48:2544, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\GenericHIDHost\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cGenericHIDHost.cConfigDescriptor.hGenericHIDHost.hmakefiledefaultYESmakefileatmega12811
GenericHIDHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.aps b/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.aps
new file mode 100644
index 0000000000..b07f8ce1ff
--- /dev/null
+++ b/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.aps
@@ -0,0 +1 @@
+JoystickHostWithParser13-Jul-2010 14:49:1113-Jul-2010 14:50:06241013-Jul-2010 14:49:1144, 18, 0, 685AVR GCCJoystickHostWithParser.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\JoystickHostWithParser\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cHIDReport.cJoystickHostWithParser.cConfigDescriptor.hHIDReport.hJoystickHostWithParser.hmakefiledefaultYESmakefileatmega12811
JoystickHostWithParser.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.aps b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.aps
new file mode 100644
index 0000000000..a3a8291cf4
--- /dev/null
+++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.aps
@@ -0,0 +1 @@
+KeyboardHost13-Jul-2010 14:50:1813-Jul-2010 14:50:34241013-Jul-2010 14:50:1844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\KeyboardHost\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cKeyboardHost.cConfigDescriptor.hKeyboardHost.hmakefiledefaultYESmakefileatmega12811
KeyboardHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.aps b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.aps
new file mode 100644
index 0000000000..43998fcdeb
--- /dev/null
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.aps
@@ -0,0 +1 @@
+KeyboardHostWithParser13-Jul-2010 14:51:2113-Jul-2010 14:52:07241013-Jul-2010 14:51:2144, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\KeyboardHostWithParser\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cHIDReport.cKeyboardHostWithParser.cConfigDescriptor.hHIDReport.hKeyboardHostWithParser.hmakefiledefaultYESmakefileatmega12811
KeyboardHostWithParser.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/MIDIHost/MIDIHost.aps b/Demos/Host/LowLevel/MIDIHost/MIDIHost.aps
new file mode 100644
index 0000000000..1b934074d6
--- /dev/null
+++ b/Demos/Host/LowLevel/MIDIHost/MIDIHost.aps
@@ -0,0 +1 @@
+MIDIHost13-Jul-2010 14:53:1513-Jul-2010 14:53:34241013-Jul-2010 14:53:1544, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\MIDIHost\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cMIDIHost.cConfigDescriptor.hMIDIHost.hmakefiledefaultYESmakefileatmega12811
MIDIHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.aps b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.aps
new file mode 100644
index 0000000000..fc8918a05c
--- /dev/null
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.aps
@@ -0,0 +1 @@
+MassStorageHost13-Jul-2010 14:52:2713-Jul-2010 14:52:48241013-Jul-2010 14:52:2744, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\MassStorageHost\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cMassStorageHost.cLib\MassStoreCommands.cConfigDescriptor.hMassStorageHost.hLib\MassStoreCommands.hLib\SCSI_Codes.hmakefiledefaultYESmakefileatmega12811
MassStorageHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.aps b/Demos/Host/LowLevel/MouseHost/MouseHost.aps
new file mode 100644
index 0000000000..6ec4d76b40
--- /dev/null
+++ b/Demos/Host/LowLevel/MouseHost/MouseHost.aps
@@ -0,0 +1 @@
+MouseHost13-Jul-2010 14:53:5813-Jul-2010 14:54:15241013-Jul-2010 14:53:5844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\MouseHost\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cMouseHost.cConfigDescriptor.hMouseHost.hmakefiledefaultYESmakefileatmega12811
MouseHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.aps b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.aps
new file mode 100644
index 0000000000..45736bccf0
--- /dev/null
+++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.aps
@@ -0,0 +1 @@
+MouseHostWithParser13-Jul-2010 14:55:2813-Jul-2010 14:55:50241013-Jul-2010 14:55:2844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\MouseHostWithParser\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cHIDReport.cMouseHostWithParser.cConfigDescriptor.hHIDReport.hMouseHostWithParser.hmakefiledefaultYESmakefileatmega12811
MouseHostWithParser.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.aps b/Demos/Host/LowLevel/PrinterHost/PrinterHost.aps
new file mode 100644
index 0000000000..ff3cac58cb
--- /dev/null
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.aps
@@ -0,0 +1 @@
+PrinterHost13-Jul-2010 14:56:2813-Jul-2010 14:57:04241013-Jul-2010 14:56:2844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\PrinterHost\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cPrinterHost.cLib\PrinterCommands.cConfigDescriptor.hPrinterHost.hLib\PrinterCommands.hmakefiledefaultYESmakefileatmega12811
PrinterHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.aps b/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.aps
new file mode 100644
index 0000000000..6194e17f99
--- /dev/null
+++ b/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.aps
@@ -0,0 +1 @@
+RNDISEthernetHost13-Jul-2010 14:57:4013-Jul-2010 14:58:02241013-Jul-2010 14:57:4044, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\RNDISEthernetHost\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cRNDISEthernetHost.cLib\RNDISCommands.cConfigDescriptor.hRNDISEthernetHost.hLib\RNDISCommands.hLib\RNDISConstants.hmakefiledefaultYESmakefileatmega12811
RNDISEthernetHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.aps b/Demos/Host/LowLevel/StillImageHost/StillImageHost.aps
new file mode 100644
index 0000000000..a4dd0ffb9a
--- /dev/null
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.aps
@@ -0,0 +1 @@
+StillImageHost13-Jul-2010 14:58:3813-Jul-2010 14:59:00241013-Jul-2010 14:58:3844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\StillImageHost\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cStillImageHost.cLib\StillImageCommands.cConfigDescriptor.hStillImageHost.hLib\PIMACodes.hLib\StillImageCommands.hmakefiledefaultYESmakefileatmega12811
StillImageHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.aps b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.aps
new file mode 100644
index 0000000000..f2b243c274
--- /dev/null
+++ b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.aps
@@ -0,0 +1 @@
+VirtualSerialHost13-Jul-2010 14:59:3313-Jul-2010 14:59:47241013-Jul-2010 14:59:3344, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\LowLevel\VirtualSerialHost\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cVirtualSerialHost.cConfigDescriptor.hVirtualSerialHost.hmakefiledefaultYESmakefileatmega12811
VirtualSerialHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/LUFA.pnproj b/LUFA.pnproj
index 1acd011bfa..431193fc97 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index e7e1f900c2..9cb7ea92dc 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -16,10 +16,8 @@
* -# Add hub support when in Host mode for multiple devices
* -# Add ability to get number of bytes not written with pipe/endpoint write routines after an error
* -# Add standardized descriptor names to class driver structures
- * -# Master LUFA include file rather than per-module includes
* -# Change makefiles to allow for absolute LUFA location to be used
* - Documentation/Support
- * -# Remake AVRStudio project files
* -# Add detailed overviews of how each demo works
* -# Add board overviews
* -# Write LUFA tutorials