From 46547bf8d612390b4afaa0e1e426a98ad65ecc6d Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Tue, 4 Nov 2014 12:27:57 +0000
Subject: [PATCH] More introjucer cleanup

---
 extras/Demo/Source/Demos/JavaScript.cpp       |   2 +-
 extras/Demo/Source/IntroScreen.cpp            |   2 +-
 .../Builds/CodeBlocks/The Introjucer.cbp      |  58 +-
 .../The Introjucer.xcodeproj/project.pbxproj  | 104 ++-
 .../VisualStudio2005/The Introjucer.vcproj    | 422 ++++-----
 .../VisualStudio2008/The Introjucer.vcproj    | 422 ++++-----
 .../VisualStudio2010/The Introjucer.vcxproj   |  14 +-
 .../The Introjucer.vcxproj.filters            |  55 +-
 .../VisualStudio2012/The Introjucer.vcxproj   |  14 +-
 .../The Introjucer.vcxproj.filters            |  55 +-
 .../VisualStudio2013/The Introjucer.vcxproj   |  14 +-
 .../The Introjucer.vcxproj.filters            |  55 +-
 extras/Introjucer/Introjucer.jucer            |  86 +-
 .../Introjucer/JuceLibraryCode/BinaryData.cpp | 875 +++++++++---------
 .../Introjucer/JuceLibraryCode/BinaryData.h   |  42 +-
 .../jucer_AnimatedComponentTemplate.cpp       |  21 +-
 .../jucer_AudioComponentTemplate.cpp          |  48 +-
 .../jucer_OpenglComponentTemplate.cpp         |  10 +-
 .../Source/Wizards/jucer_NewFileWizard.h      |   6 +-
 .../Wizards/jucer_ProjectWizard_Animated.h    |   4 +-
 .../Wizards/jucer_ProjectWizard_AudioApp.h    |   4 +-
 21 files changed, 1174 insertions(+), 1139 deletions(-)

diff --git a/extras/Demo/Source/Demos/JavaScript.cpp b/extras/Demo/Source/Demos/JavaScript.cpp
index 084733c406..cb08ffacd9 100644
--- a/extras/Demo/Source/Demos/JavaScript.cpp
+++ b/extras/Demo/Source/Demos/JavaScript.cpp
@@ -156,4 +156,4 @@ private:
 
 
 // This static object will register this demo type in a global list of demos..
-static JuceDemoType<JavaScriptDemo> demo ("40 JavaScript");
\ No newline at end of file
+static JuceDemoType<JavaScriptDemo> demo ("40 JavaScript");
diff --git a/extras/Demo/Source/IntroScreen.cpp b/extras/Demo/Source/IntroScreen.cpp
index eeac460fc5..3708f6569c 100644
--- a/extras/Demo/Source/IntroScreen.cpp
+++ b/extras/Demo/Source/IntroScreen.cpp
@@ -82,7 +82,7 @@ private:
         {
             Path wavePath;
 
-            float waveStep = 10.0f;
+            const float waveStep = 10.0f;
             int i = 0;
 
             for (float x = waveStep * 0.5f; x < getWidth(); x += waveStep)
diff --git a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
index cdbd08b7fd..70c1fa0e28 100644
--- a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
+++ b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
@@ -622,39 +622,11 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
-    <Unit filename="../../Source/BinaryData/jucer_OpenglComponentTemplate.cpp">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
-    <Unit filename="../../Source/BinaryData/jucer_AudioComponentTemplate.cpp">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
-    <Unit filename="../../Source/BinaryData/jucer_MainTemplate_SimpleWindow.cpp">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
     <Unit filename="../../Source/BinaryData/jucer_AnimatedComponentTemplate.cpp">
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
-    <Unit filename="../../Source/BinaryData/AudioPluginXCodeScript.txt">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
-    <Unit filename="../../Source/BinaryData/background_tile.png">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
-    <Unit filename="../../Source/BinaryData/colourscheme_dark.xml">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
-    <Unit filename="../../Source/BinaryData/colourscheme_light.xml">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
-    <Unit filename="../../Source/BinaryData/juce_icon.png">
+    <Unit filename="../../Source/BinaryData/jucer_AudioComponentTemplate.cpp">
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
@@ -702,6 +674,10 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
+    <Unit filename="../../Source/BinaryData/jucer_MainTemplate_SimpleWindow.cpp">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
     <Unit filename="../../Source/BinaryData/jucer_MainTemplate_Window.cpp">
       <Option compile="0"/>
       <Option link="0"/>
@@ -726,6 +702,30 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
+    <Unit filename="../../Source/BinaryData/jucer_OpenGLComponentTemplate.cpp">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../Source/BinaryData/AudioPluginXCodeScript.txt">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../Source/BinaryData/background_tile.png">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../Source/BinaryData/colourscheme_dark.xml">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../Source/BinaryData/colourscheme_light.xml">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../Source/BinaryData/juce_icon.png">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
     <Unit filename="../../Source/BinaryData/projectIconAndroid.png">
       <Option compile="0"/>
       <Option link="0"/>
diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index 013cb3227f..3d7d131d3a 100644
--- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
@@ -463,6 +463,7 @@
 		7256D1C79741E66E2C002EE2 = {isa = PBXFileReference; lastKnownFileType = file.svg; name = "wizard_DLL.svg"; path = "../../Source/BinaryData/wizard_DLL.svg"; sourceTree = "SOURCE_ROOT"; };
 		72FED7B10FBF5AD1F504FDFF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Value.h"; path = "../../../../modules/juce_data_structures/values/juce_Value.h"; sourceTree = "SOURCE_ROOT"; };
 		736E99601AB6C492D82DBF3A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HyperlinkButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.h"; sourceTree = "SOURCE_ROOT"; };
+		73B9F17FE55A02C2BB87E008 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_OpenGLComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_OpenGLComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
 		73CEF8ADF016E554F96FD3B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CompilerSupport.h"; path = "../../../../modules/juce_core/system/juce_CompilerSupport.h"; sourceTree = "SOURCE_ROOT"; };
 		7435199CD81F307322FE1065 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7507846FD162469386479CDB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MenuBarModel.cpp"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarModel.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -804,57 +805,58 @@
 		D926E13AB5AD647A7A00F486 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D92A6E9404A30EED32DCE4ED = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_RelativePositionedRectangle.h"; path = "../../Source/ComponentEditor/ui/jucer_RelativePositionedRectangle.h"; sourceTree = "SOURCE_ROOT"; };
 		D9342535EA61901A1AD816C6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
-		D95D7B49EC6C6BDCB5A1B988 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
 		D9B077E2ECDDA94961E134D7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
 		D9E59DE07A815AB303A297D9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_data_structures.mm"; path = "../../../../modules/juce_data_structures/juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; };
 		DAF84A553D264705FA6EB6FF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TreeViewHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TreeViewHandler.h"; sourceTree = "SOURCE_ROOT"; };
-		DB20268A566DABEAE3F2CBEE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RectanglePlacement.cpp"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DB876F7873F42DC685A58CA7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DC5E7FF30B01118F6DAEC38F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Time.cpp"; path = "../../../../modules/juce_core/time/juce_Time.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DCCB75165B7C73A589498E87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DD2494D5F1C081898D616AF5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyListener.cpp"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DD985A60FB76E976AF91852D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SHA256.h"; path = "../../../../modules/juce_cryptography/hashing/juce_SHA256.h"; sourceTree = "SOURCE_ROOT"; };
-		DE5F3C9EF6BFFDE73AF9E7FC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsDisplayComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DF725A596B7BCD7520CC0A9F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ResourceEditorPanel.cpp"; path = "../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DF7BB5B6B394EDEEF5F5B4B8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallbackMessage.h"; path = "../../../../modules/juce_events/messages/juce_CallbackMessage.h"; sourceTree = "SOURCE_ROOT"; };
-		E07C56267CBB46FC44EF2026 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Image.cpp"; path = "../../../../modules/juce_graphics/images/juce_Image.cpp"; sourceTree = "SOURCE_ROOT"; };
-		E0F9CA57E44F7F7E7E217E47 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentUndoableAction.h"; path = "../../Source/ComponentEditor/components/jucer_ComponentUndoableAction.h"; sourceTree = "SOURCE_ROOT"; };
-		E19160CF7208320D128786CF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Javascript.h"; path = "../../../../modules/juce_core/javascript/juce_Javascript.h"; sourceTree = "SOURCE_ROOT"; };
-		E4BB22E27C5AA4B666F265BD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TextButtonHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TextButtonHandler.h"; sourceTree = "SOURCE_ROOT"; };
-		E5D6C36496F5BC84D7213BE8 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		E65A820D34BF39478B7C5925 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_DocumentEditorComponent.h"; path = "../../Source/Application/jucer_DocumentEditorComponent.h"; sourceTree = "SOURCE_ROOT"; };
-		E96597BBC6A98255B51B94DC = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		25F52316D256B4534BED16D1 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Introjucer.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
-		D4444EC6342A2A7BC4F7BC46 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentTextProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_ComponentTextProperty.h"; sourceTree = "SOURCE_ROOT"; };
-		D87FC8F6834E9DC9C8E88B94 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_JustificationProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_JustificationProperty.h"; sourceTree = "SOURCE_ROOT"; };
-		DA345D5B9DABD049F90DC96F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GeneratedCode.h"; path = "../../Source/ComponentEditor/jucer_GeneratedCode.h"; sourceTree = "SOURCE_ROOT"; };
-		DBE0CDE1B017190ABBFF557C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_CodeBlocks.h"; path = "../../Source/Project Saving/jucer_ProjectExport_CodeBlocks.h"; sourceTree = "SOURCE_ROOT"; };
 		DC922C6A65D260C18E888E49 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_ComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DCCB75165B7C73A589498E87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DD00494140C86144306A9356 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Array.h"; path = "../../../../modules/juce_core/containers/juce_Array.h"; sourceTree = "SOURCE_ROOT"; };
+		DD2494D5F1C081898D616AF5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyListener.cpp"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DE40B42B57F29C650CB7F2AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RecentlyOpenedFilesList.h"; path = "../../../../modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.h"; sourceTree = "SOURCE_ROOT"; };
+		DE5F3C9EF6BFFDE73AF9E7FC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsDisplayComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DE8DF5D263F40F65581CFDE4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ChildProcess.cpp"; path = "../../../../modules/juce_core/threads/juce_ChildProcess.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DEF579B1433EB8DEE7AB50F8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Drawable.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DF725A596B7BCD7520CC0A9F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ResourceEditorPanel.cpp"; path = "../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DFC6364D81D9C60BD4CA9D12 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativeTime.cpp"; path = "../../../../modules/juce_core/time/juce_RelativeTime.cpp"; sourceTree = "SOURCE_ROOT"; };
-		E1C16C872E34BCB144B469F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_EdgeTable.h"; path = "../../../../modules/juce_graphics/geometry/juce_EdgeTable.h"; sourceTree = "SOURCE_ROOT"; };
+		E0F9CA57E44F7F7E7E217E47 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentUndoableAction.h"; path = "../../Source/ComponentEditor/components/jucer_ComponentUndoableAction.h"; sourceTree = "SOURCE_ROOT"; };
+		E19160CF7208320D128786CF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Javascript.h"; path = "../../../../modules/juce_core/javascript/juce_Javascript.h"; sourceTree = "SOURCE_ROOT"; };
 		E1D8CCD9F4ACBE1EC1D5BEA0 = {isa = PBXFileReference; lastKnownFileType = file.svg; name = "wizard_AudioApp.svg"; path = "../../Source/BinaryData/wizard_AudioApp.svg"; sourceTree = "SOURCE_ROOT"; };
 		E2374E15D65425C4101237E2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_NewComponentTemplate.h"; path = "../../Source/BinaryData/jucer_NewComponentTemplate.h"; sourceTree = "SOURCE_ROOT"; };
-		E27F0860F27023BAA9798B46 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Rectangle.h"; path = "../../../../modules/juce_graphics/geometry/juce_Rectangle.h"; sourceTree = "SOURCE_ROOT"; };
 		E284B565DBD647DC0830D23B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ButtonPropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E293F9DE1162A7D27E1FAC1F = {isa = PBXFileReference; lastKnownFileType = image.png; name = projectIconVisualStudio08.png; path = ../../Source/BinaryData/projectIconVisualStudio08.png; sourceTree = "SOURCE_ROOT"; };
 		E2C1C995D554A3F0A363CE58 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Thread.h"; path = "../../../../modules/juce_core/threads/juce_Thread.h"; sourceTree = "SOURCE_ROOT"; };
 		E2DBA3307837B64AFCCD8F8D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_File.cpp"; path = "../../../../modules/juce_core/files/juce_File.cpp"; sourceTree = "SOURCE_ROOT"; };
-		E3869AC657E984565F1718AA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ConnectedChildProcess.h"; path = "../../../../modules/juce_events/interprocess/juce_ConnectedChildProcess.h"; sourceTree = "SOURCE_ROOT"; };
 		E3B56C5718D87CA0EFCB2662 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_AudioComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_AudioComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
-		E3FF16862AA1B2F943DC616C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageCache.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageCache.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E446FFE889CD490FDE3F0F2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ThreadWithProgressWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
+		E4BB22E27C5AA4B666F265BD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TextButtonHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TextButtonHandler.h"; sourceTree = "SOURCE_ROOT"; };
 		E4BD4C43370651B49F75855B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MainTemplate_SimpleWindow.cpp"; path = "../../Source/BinaryData/jucer_MainTemplate_SimpleWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
-		E4E74B2BC3F3CB5A4F4DC55E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_gui_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
 		E4F9D1E097CC2C1D1291823C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E530742870F07704E9616358 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarItemComponent.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h"; sourceTree = "SOURCE_ROOT"; };
+		E5D6C36496F5BC84D7213BE8 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		E62D9BA6E92FE7BB6EF65699 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_JSON.h"; path = "../../../../modules/juce_core/javascript/juce_JSON.h"; sourceTree = "SOURCE_ROOT"; };
+		E65A820D34BF39478B7C5925 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_DocumentEditorComponent.h"; path = "../../Source/Application/jucer_DocumentEditorComponent.h"; sourceTree = "SOURCE_ROOT"; };
+		E7E1C4F416CFA44BE7DD1A74 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KeyboardFocusTraverser.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h"; sourceTree = "SOURCE_ROOT"; };
+		E96597BBC6A98255B51B94DC = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
+		25F52316D256B4534BED16D1 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Introjucer.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
+		D4444EC6342A2A7BC4F7BC46 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentTextProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_ComponentTextProperty.h"; sourceTree = "SOURCE_ROOT"; };
+		D87FC8F6834E9DC9C8E88B94 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_JustificationProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_JustificationProperty.h"; sourceTree = "SOURCE_ROOT"; };
+		D95D7B49EC6C6BDCB5A1B988 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
+		DA345D5B9DABD049F90DC96F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GeneratedCode.h"; path = "../../Source/ComponentEditor/jucer_GeneratedCode.h"; sourceTree = "SOURCE_ROOT"; };
+		DB20268A566DABEAE3F2CBEE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RectanglePlacement.cpp"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DB876F7873F42DC685A58CA7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DBE0CDE1B017190ABBFF557C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_CodeBlocks.h"; path = "../../Source/Project Saving/jucer_ProjectExport_CodeBlocks.h"; sourceTree = "SOURCE_ROOT"; };
+		DD985A60FB76E976AF91852D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SHA256.h"; path = "../../../../modules/juce_cryptography/hashing/juce_SHA256.h"; sourceTree = "SOURCE_ROOT"; };
+		DF7BB5B6B394EDEEF5F5B4B8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallbackMessage.h"; path = "../../../../modules/juce_events/messages/juce_CallbackMessage.h"; sourceTree = "SOURCE_ROOT"; };
+		E07C56267CBB46FC44EF2026 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Image.cpp"; path = "../../../../modules/juce_graphics/images/juce_Image.cpp"; sourceTree = "SOURCE_ROOT"; };
+		E1C16C872E34BCB144B469F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_EdgeTable.h"; path = "../../../../modules/juce_graphics/geometry/juce_EdgeTable.h"; sourceTree = "SOURCE_ROOT"; };
+		E27F0860F27023BAA9798B46 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Rectangle.h"; path = "../../../../modules/juce_graphics/geometry/juce_Rectangle.h"; sourceTree = "SOURCE_ROOT"; };
+		E3869AC657E984565F1718AA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ConnectedChildProcess.h"; path = "../../../../modules/juce_events/interprocess/juce_ConnectedChildProcess.h"; sourceTree = "SOURCE_ROOT"; };
+		E3FF16862AA1B2F943DC616C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageCache.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageCache.cpp"; sourceTree = "SOURCE_ROOT"; };
+		E4E74B2BC3F3CB5A4F4DC55E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_gui_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
 		E54D0994D31E20A0A05EBA2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SystemTrayIconComponent.h"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E570E57CC1FCEF78B54A7084 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileOutputStream.h"; path = "../../../../modules/juce_core/files/juce_FileOutputStream.h"; sourceTree = "SOURCE_ROOT"; };
 		E60E28D1B7491047DEA236AE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectContentComponent.h"; path = "../../Source/Project/jucer_ProjectContentComponent.h"; sourceTree = "SOURCE_ROOT"; };
-		E62D9BA6E92FE7BB6EF65699 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_JSON.h"; path = "../../../../modules/juce_core/javascript/juce_JSON.h"; sourceTree = "SOURCE_ROOT"; };
 		E63F54CF8D5D922A319C6962 = {isa = PBXFileReference; lastKnownFileType = image.png; name = projectIconXcodeIOS.png; path = ../../Source/BinaryData/projectIconXcodeIOS.png; sourceTree = "SOURCE_ROOT"; };
 		E642193A9990C48CFB6479A9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileListComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E654E3A3CD45A888C5F773DF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MenuBarModel.h"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarModel.h"; sourceTree = "SOURCE_ROOT"; };
@@ -866,7 +868,6 @@
 		E7B6A0CBA0D27A095E83F5B7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E7D09B860F4D4A13D4312C38 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertiesFile.cpp"; path = "../../../../modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E7E122AE104E79BB641B07B3 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_data_structures/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
-		E7E1C4F416CFA44BE7DD1A74 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KeyboardFocusTraverser.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h"; sourceTree = "SOURCE_ROOT"; };
 		E7E1D60BC7AEF79AA7B65B7C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_String.cpp"; path = "../../../../modules/juce_core/text/juce_String.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E7F098BA306EC789242AB9A8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E82C9EF1A74D867BBFF2090D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RSAKey.cpp"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -892,7 +893,6 @@
 		F03E2BDD36E6F4F53AB767A8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_Headers.h"; path = "../../Source/jucer_Headers.h"; sourceTree = "SOURCE_ROOT"; };
 		F07EA5078D6BB60B698F5E12 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_SystemStats.cpp"; path = "../../../../modules/juce_core/native/juce_android_SystemStats.cpp"; sourceTree = "SOURCE_ROOT"; };
 		F08EB921DB62255A4B6DE85A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RectangleList.h"; path = "../../../../modules/juce_graphics/geometry/juce_RectangleList.h"; sourceTree = "SOURCE_ROOT"; };
-		F0CCE6701E090A22780C4B07 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_OpenglComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_OpenglComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
 		F100CFF192886B7699632A62 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Network.mm"; path = "../../../../modules/juce_core/native/juce_mac_Network.mm"; sourceTree = "SOURCE_ROOT"; };
 		F1164F66F799CEA74174328A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Logger.cpp"; path = "../../../../modules/juce_core/logging/juce_Logger.cpp"; sourceTree = "SOURCE_ROOT"; };
 		F18AE75F1831D13FF53A8CCC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_PaintElementRectangle.h"; path = "../../Source/ComponentEditor/paintelements/jucer_PaintElementRectangle.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1102,6 +1102,28 @@
 					9BC8AE609A07657CEF587548,
 					D3E139185095C486DD3D61F2,
 					8090981F07A76E465DAAADF4, ); name = Utility; sourceTree = "<group>"; };
+		955A73C474B8CD4FB0D9A96F = {isa = PBXGroup; children = (
+					468BFFBE4DA7835DD40C5FE8,
+					E3B56C5718D87CA0EFCB2662,
+					0075C5208947159AF2802F3B,
+					AFF72BA2B130F3F9AC029080,
+					65F4749184C84C2FDBB4C305,
+					03D3053EDE47FED1919C6674,
+					DC922C6A65D260C18E888E49,
+					963E0740B7B4D59EF2D16740,
+					9683B04CA3BD7F73E8236FE2,
+					35E6EE1E98DD7050DDFECD9B,
+					24C34D0578AE6C7A3EA18781,
+					18D9EBA1DAE45EEF81FD5C8F,
+					AE1BC6DCCFC1A18E2ACE23F1,
+					E4BD4C43370651B49F75855B,
+					86E8A40E5A83781A8478454D,
+					61BE37E2B26C25056D9E8FE2,
+					E2374E15D65425C4101237E2,
+					CF8011B3C67B609032974DA5,
+					53151B683E11F420203E61C2,
+					F7CAB5BC15EE351949D3F2C3,
+					73B9F17FE55A02C2BB87E008, ); name = templates; sourceTree = "<group>"; };
 		EA13CB5FD121EE215A7A51BE = {isa = PBXGroup; children = (
 					A69024A225F2AC31F17B1314,
 					11DC04468BC6023671017EBF,
@@ -1118,34 +1140,14 @@
 					A085174413736ACC8D7D42A2,
 					471C7B0A8B92320AF0C80839,
 					714267352CE5C4357ADBC231,
-					C09BBB58CA45B66D693E8C31, ); name = Wizards; sourceTree = "<group>"; };
+					C09BBB58CA45B66D693E8C31,
+					955A73C474B8CD4FB0D9A96F, ); name = Wizards; sourceTree = "<group>"; };
 		88DFD62CB6545EE8CA5C485B = {isa = PBXGroup; children = (
-					F0CCE6701E090A22780C4B07,
-					E3B56C5718D87CA0EFCB2662,
-					E4BD4C43370651B49F75855B,
-					468BFFBE4DA7835DD40C5FE8,
 					5F4F4EAB042F2730F94A1CEA,
 					301592EBAC0FFF6F5B268E99,
 					41105E536155E394E54BDD35,
 					5F6584B675E30761521A9F42,
 					B483D960309FAFC193F9CDA2,
-					0075C5208947159AF2802F3B,
-					AFF72BA2B130F3F9AC029080,
-					65F4749184C84C2FDBB4C305,
-					03D3053EDE47FED1919C6674,
-					DC922C6A65D260C18E888E49,
-					963E0740B7B4D59EF2D16740,
-					9683B04CA3BD7F73E8236FE2,
-					35E6EE1E98DD7050DDFECD9B,
-					24C34D0578AE6C7A3EA18781,
-					18D9EBA1DAE45EEF81FD5C8F,
-					AE1BC6DCCFC1A18E2ACE23F1,
-					86E8A40E5A83781A8478454D,
-					61BE37E2B26C25056D9E8FE2,
-					E2374E15D65425C4101237E2,
-					CF8011B3C67B609032974DA5,
-					53151B683E11F420203E61C2,
-					F7CAB5BC15EE351949D3F2C3,
 					1A8E24245E48C7C4DB0164E6,
 					353E622BE257074B5589199D,
 					8BBD620A595D883BE34D60D6,
diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index 0d85d24368..56a1748b6f 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
@@ -314,48 +314,220 @@
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_StaticLibrary.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_StartPageComponent.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h"/>
+        <Filter Name="templates">
+          <File RelativePath="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_ComponentTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_ContentCompTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewComponentTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+        </Filter>
       </Filter>
       <Filter Name="BinaryData">
-        <File RelativePath="..\..\Source\BinaryData\jucer_OpenglComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
         <File RelativePath="..\..\Source\BinaryData\AudioPluginXCodeScript.txt">
           <FileConfiguration Name="Debug|Win32"
                              ExcludedFromBuild="true">
@@ -397,176 +569,6 @@
           </FileConfiguration>
         </File>
         <File RelativePath="..\..\Source\BinaryData\juce_icon.png"/>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_ComponentTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_ContentCompTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewComponentTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
         <File RelativePath="..\..\Source\BinaryData\projectIconAndroid.png">
           <FileConfiguration Name="Debug|Win32"
                              ExcludedFromBuild="true">
diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
index edb7d52303..577691c7c6 100644
--- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
@@ -314,48 +314,220 @@
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_StaticLibrary.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_StartPageComponent.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h"/>
+        <Filter Name="templates">
+          <File RelativePath="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_ComponentTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_ContentCompTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewComponentTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+        </Filter>
       </Filter>
       <Filter Name="BinaryData">
-        <File RelativePath="..\..\Source\BinaryData\jucer_OpenglComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
         <File RelativePath="..\..\Source\BinaryData\AudioPluginXCodeScript.txt">
           <FileConfiguration Name="Debug|Win32"
                              ExcludedFromBuild="true">
@@ -397,176 +569,6 @@
           </FileConfiguration>
         </File>
         <File RelativePath="..\..\Source\BinaryData\juce_icon.png"/>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_ComponentTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_ContentCompTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewComponentTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
         <File RelativePath="..\..\Source\BinaryData\projectIconAndroid.png">
           <FileConfiguration Name="Debug|Win32"
                              ExcludedFromBuild="true">
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
index 474e17c209..5ddc32df5c 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
@@ -167,18 +167,12 @@
     <ClCompile Include="..\..\Source\Utility\jucer_StoredSettings.cpp"/>
     <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
     <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenglComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -197,6 +191,9 @@
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -206,6 +203,9 @@
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
index 3c02efb0f9..b0f2d7df81 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
@@ -41,6 +41,9 @@
     <Filter Include="The Introjucer\Wizards">
       <UniqueIdentifier>{CB03A00B-C740-D8D3-A019-4C165270265F}</UniqueIdentifier>
     </Filter>
+    <Filter Include="The Introjucer\Wizards\templates">
+      <UniqueIdentifier>{EF91E5A7-0051-0493-4B4A-D458322DB03D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="The Introjucer\BinaryData">
       <UniqueIdentifier>{768EDA37-3A9B-E5C5-8D35-27FEF74CCBA0}</UniqueIdentifier>
     </Filter>
@@ -373,44 +376,44 @@
     <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp">
       <Filter>The Introjucer\Wizards</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenglComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
       <Filter>Juce Modules\juce_core\text</Filter>
@@ -1693,28 +1696,28 @@
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_ComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.h">
       <Filter>Juce Modules\juce_core\text</Filter>
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
index bce1f825e3..4fe92b9763 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj	
@@ -173,18 +173,12 @@
     <ClCompile Include="..\..\Source\Utility\jucer_StoredSettings.cpp"/>
     <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
     <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenglComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -203,6 +197,9 @@
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -212,6 +209,9 @@
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters
index 3c02efb0f9..b0f2d7df81 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters	
@@ -41,6 +41,9 @@
     <Filter Include="The Introjucer\Wizards">
       <UniqueIdentifier>{CB03A00B-C740-D8D3-A019-4C165270265F}</UniqueIdentifier>
     </Filter>
+    <Filter Include="The Introjucer\Wizards\templates">
+      <UniqueIdentifier>{EF91E5A7-0051-0493-4B4A-D458322DB03D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="The Introjucer\BinaryData">
       <UniqueIdentifier>{768EDA37-3A9B-E5C5-8D35-27FEF74CCBA0}</UniqueIdentifier>
     </Filter>
@@ -373,44 +376,44 @@
     <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp">
       <Filter>The Introjucer\Wizards</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenglComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
       <Filter>Juce Modules\juce_core\text</Filter>
@@ -1693,28 +1696,28 @@
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_ComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.h">
       <Filter>Juce Modules\juce_core\text</Filter>
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
index c6d831e917..084c153f59 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj	
@@ -173,18 +173,12 @@
     <ClCompile Include="..\..\Source\Utility\jucer_StoredSettings.cpp"/>
     <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
     <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenglComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -203,6 +197,9 @@
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -212,6 +209,9 @@
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters
index 42094148ab..f6d4b90a60 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters	
@@ -41,6 +41,9 @@
     <Filter Include="The Introjucer\Wizards">
       <UniqueIdentifier>{CB03A00B-C740-D8D3-A019-4C165270265F}</UniqueIdentifier>
     </Filter>
+    <Filter Include="The Introjucer\Wizards\templates">
+      <UniqueIdentifier>{EF91E5A7-0051-0493-4B4A-D458322DB03D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="The Introjucer\BinaryData">
       <UniqueIdentifier>{768EDA37-3A9B-E5C5-8D35-27FEF74CCBA0}</UniqueIdentifier>
     </Filter>
@@ -373,44 +376,44 @@
     <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp">
       <Filter>The Introjucer\Wizards</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenglComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
       <Filter>Juce Modules\juce_core\text</Filter>
@@ -1693,28 +1696,28 @@
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_ComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h">
-      <Filter>The Introjucer\BinaryData</Filter>
+      <Filter>The Introjucer\Wizards\templates</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.h">
       <Filter>Juce Modules\juce_core\text</Filter>
diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer
index 9625da22d4..e21728b9be 100644
--- a/extras/Introjucer/Introjucer.jucer
+++ b/extras/Introjucer/Introjucer.jucer
@@ -502,16 +502,52 @@
             file="Source/Wizards/jucer_StartPageComponent.h"/>
       <FILE id="BlL6EA" name="jucer_TemplateThumbnailsComponent.h" compile="0"
             resource="0" file="Source/Wizards/jucer_TemplateThumbnailsComponent.h"/>
+      <GROUP id="{2EFFC5F3-CE4A-FCEB-391B-A644E7394EE3}" name="templates">
+        <FILE id="Ksvdgw" name="jucer_AnimatedComponentTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_AnimatedComponentTemplate.cpp"/>
+        <FILE id="zI7KxE" name="jucer_AudioComponentTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_AudioComponentTemplate.cpp"/>
+        <FILE id="8H7vztx" name="jucer_AudioPluginEditorTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_AudioPluginEditorTemplate.cpp"/>
+        <FILE id="908LsXi" name="jucer_AudioPluginEditorTemplate.h" compile="0"
+              resource="1" file="Source/BinaryData/jucer_AudioPluginEditorTemplate.h"/>
+        <FILE id="AfHjhZ9" name="jucer_AudioPluginFilterTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp"/>
+        <FILE id="pvgTmND" name="jucer_AudioPluginFilterTemplate.h" compile="0"
+              resource="1" file="Source/BinaryData/jucer_AudioPluginFilterTemplate.h"/>
+        <FILE id="gM9qyy" name="jucer_ComponentTemplate.cpp" compile="0" resource="1"
+              file="Source/BinaryData/jucer_ComponentTemplate.cpp"/>
+        <FILE id="TSDD99" name="jucer_ComponentTemplate.h" compile="0" resource="1"
+              file="Source/BinaryData/jucer_ComponentTemplate.h"/>
+        <FILE id="xl685P" name="jucer_ContentCompTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_ContentCompTemplate.cpp"/>
+        <FILE id="gFj8Jl" name="jucer_ContentCompTemplate.h" compile="0" resource="1"
+              file="Source/BinaryData/jucer_ContentCompTemplate.h"/>
+        <FILE id="BnCgp2" name="jucer_InlineComponentTemplate.h" compile="0"
+              resource="1" file="Source/BinaryData/jucer_InlineComponentTemplate.h"/>
+        <FILE id="pizYtv9" name="jucer_MainConsoleAppTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_MainConsoleAppTemplate.cpp"/>
+        <FILE id="tZCXSl" name="jucer_MainTemplate_NoWindow.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_MainTemplate_NoWindow.cpp"/>
+        <FILE id="R7OBsx" name="jucer_MainTemplate_SimpleWindow.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_MainTemplate_SimpleWindow.cpp"/>
+        <FILE id="W9iwHx" name="jucer_MainTemplate_Window.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_MainTemplate_Window.cpp"/>
+        <FILE id="fWEsCu" name="jucer_NewComponentTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_NewComponentTemplate.cpp"/>
+        <FILE id="ljPBjw" name="jucer_NewComponentTemplate.h" compile="0" resource="1"
+              file="Source/BinaryData/jucer_NewComponentTemplate.h"/>
+        <FILE id="cI2ImgX" name="jucer_NewCppFileTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_NewCppFileTemplate.cpp"/>
+        <FILE id="YDcz5P" name="jucer_NewCppFileTemplate.h" compile="0" resource="1"
+              file="Source/BinaryData/jucer_NewCppFileTemplate.h"/>
+        <FILE id="teqnin" name="jucer_NewInlineComponentTemplate.h" compile="0"
+              resource="1" file="Source/BinaryData/jucer_NewInlineComponentTemplate.h"/>
+        <FILE id="MMiar4" name="jucer_OpenGLComponentTemplate.cpp" compile="0"
+              resource="1" file="Source/BinaryData/jucer_OpenGLComponentTemplate.cpp"/>
+      </GROUP>
     </GROUP>
     <GROUP id="KPIRFfz" name="BinaryData">
-      <FILE id="MMiar4" name="jucer_OpenglComponentTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_OpenglComponentTemplate.cpp"/>
-      <FILE id="zI7KxE" name="jucer_AudioComponentTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_AudioComponentTemplate.cpp"/>
-      <FILE id="R7OBsx" name="jucer_MainTemplate_SimpleWindow.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_MainTemplate_SimpleWindow.cpp"/>
-      <FILE id="Ksvdgw" name="jucer_AnimatedComponentTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_AnimatedComponentTemplate.cpp"/>
       <FILE id="RSJcrRl" name="AudioPluginXCodeScript.txt" compile="0" resource="1"
             file="Source/BinaryData/AudioPluginXCodeScript.txt"/>
       <FILE id="eYn4jB" name="background_tile.png" compile="0" resource="1"
@@ -521,40 +557,6 @@
       <FILE id="Rm5UQS" name="colourscheme_light.xml" compile="0" resource="1"
             file="Source/BinaryData/colourscheme_light.xml"/>
       <FILE id="rVgowdy" name="juce_icon.png" compile="0" resource="0" file="Source/BinaryData/juce_icon.png"/>
-      <FILE id="8H7vztx" name="jucer_AudioPluginEditorTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_AudioPluginEditorTemplate.cpp"/>
-      <FILE id="908LsXi" name="jucer_AudioPluginEditorTemplate.h" compile="0"
-            resource="1" file="Source/BinaryData/jucer_AudioPluginEditorTemplate.h"/>
-      <FILE id="AfHjhZ9" name="jucer_AudioPluginFilterTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp"/>
-      <FILE id="pvgTmND" name="jucer_AudioPluginFilterTemplate.h" compile="0"
-            resource="1" file="Source/BinaryData/jucer_AudioPluginFilterTemplate.h"/>
-      <FILE id="gM9qyy" name="jucer_ComponentTemplate.cpp" compile="0" resource="1"
-            file="Source/BinaryData/jucer_ComponentTemplate.cpp"/>
-      <FILE id="TSDD99" name="jucer_ComponentTemplate.h" compile="0" resource="1"
-            file="Source/BinaryData/jucer_ComponentTemplate.h"/>
-      <FILE id="xl685P" name="jucer_ContentCompTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_ContentCompTemplate.cpp"/>
-      <FILE id="gFj8Jl" name="jucer_ContentCompTemplate.h" compile="0" resource="1"
-            file="Source/BinaryData/jucer_ContentCompTemplate.h"/>
-      <FILE id="BnCgp2" name="jucer_InlineComponentTemplate.h" compile="0"
-            resource="1" file="Source/BinaryData/jucer_InlineComponentTemplate.h"/>
-      <FILE id="pizYtv9" name="jucer_MainConsoleAppTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_MainConsoleAppTemplate.cpp"/>
-      <FILE id="tZCXSl" name="jucer_MainTemplate_NoWindow.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_MainTemplate_NoWindow.cpp"/>
-      <FILE id="W9iwHx" name="jucer_MainTemplate_Window.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_MainTemplate_Window.cpp"/>
-      <FILE id="fWEsCu" name="jucer_NewComponentTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_NewComponentTemplate.cpp"/>
-      <FILE id="ljPBjw" name="jucer_NewComponentTemplate.h" compile="0" resource="1"
-            file="Source/BinaryData/jucer_NewComponentTemplate.h"/>
-      <FILE id="cI2ImgX" name="jucer_NewCppFileTemplate.cpp" compile="0"
-            resource="1" file="Source/BinaryData/jucer_NewCppFileTemplate.cpp"/>
-      <FILE id="YDcz5P" name="jucer_NewCppFileTemplate.h" compile="0" resource="1"
-            file="Source/BinaryData/jucer_NewCppFileTemplate.h"/>
-      <FILE id="teqnin" name="jucer_NewInlineComponentTemplate.h" compile="0"
-            resource="1" file="Source/BinaryData/jucer_NewInlineComponentTemplate.h"/>
       <FILE id="b8Brir" name="projectIconAndroid.png" compile="0" resource="1"
             file="Source/BinaryData/projectIconAndroid.png"/>
       <FILE id="wdeicV" name="projectIconCodeblocks.png" compile="0" resource="1"
diff --git a/extras/Introjucer/JuceLibraryCode/BinaryData.cpp b/extras/Introjucer/JuceLibraryCode/BinaryData.cpp
index cdffa0b255..f8efb039ec 100644
--- a/extras/Introjucer/JuceLibraryCode/BinaryData.cpp
+++ b/extras/Introjucer/JuceLibraryCode/BinaryData.cpp
@@ -7,7 +7,7 @@
 namespace BinaryData
 {
 
-//================== jucer_OpenglComponentTemplate.cpp ==================
+//================== jucer_AnimatedComponentTemplate.cpp ==================
 static const unsigned char temp_binary_data_0[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
@@ -27,31 +27,36 @@ static const unsigned char temp_binary_data_0[] =
 "    This component lives inside our window, and this is where you should put all\r\n"
 "    your controls and content.\r\n"
 "*/\r\n"
-"class MainContentComponent   : public OpenGLAppComponent\r\n"
+"class MainContentComponent   : public AnimatedAppComponent\r\n"
 "{\r\n"
 "public:\r\n"
 "    //==============================================================================\r\n"
-"\r\n"
-"\r\n"
 "    MainContentComponent()\r\n"
 "    {\r\n"
 "        setSize (500, 400);\r\n"
-"        \r\n"
+"        setFramesPerSecond (60);\r\n"
 "    }\r\n"
 "\r\n"
 "    ~MainContentComponent()\r\n"
 "    {\r\n"
-"        shutdownAudio();\r\n"
 "    }\r\n"
 "\r\n"
-"    void paint (Graphics& g)\r\n"
+"    void update() override\r\n"
 "    {\r\n"
-"        // fill background\r\n"
+"        // This function is called at the frequency specified by the setFramesPerSecond() call\r\n"
+"        // in the constructor. You can use it\r\n"
+"    }\r\n"
+"\r\n"
+"    void paint (Graphics& g) override\r\n"
+"    {\r\n"
+"        // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n"
 "        g.fillAll (Colours::black);\r\n"
 "\r\n"
+"\r\n"
+"        // You can add your drawing code here!\r\n"
 "    }\r\n"
 "\r\n"
-"    void resized()\r\n"
+"    void resized() override\r\n"
 "    {\r\n"
 "        // This is called when the MainContentComponent is resized.\r\n"
 "        // If you add any child components, this is where you should\r\n"
@@ -61,20 +66,22 @@ static const unsigned char temp_binary_data_0[] =
 "\r\n"
 "private:\r\n"
 "    //==============================================================================\r\n"
-"    \r\n"
-"    // private member variables\r\n"
-"    \r\n"
-"    \r\n"
-"    \r\n"
+"\r\n"
+"    // Your private member variables go here...\r\n"
+"\r\n"
+"\r\n"
+"\r\n"
 "    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent)\r\n"
 "};\r\n"
 "\r\n"
 "\r\n"
-"Component* createMainContentComponent() { return new MainContentComponent(); };\r\n"
+"// (This function is called by the app startup code to create our main component)\r\n"
+"Component* createMainContentComponent()    { return new MainContentComponent(); }\r\n"
 "\r\n"
-"#endif  // MAINCOMPONENT_H_INCLUDED";
+"\r\n"
+"#endif  // MAINCOMPONENT_H_INCLUDED\r\n";
 
-const char* jucer_OpenglComponentTemplate_cpp = (const char*) temp_binary_data_0;
+const char* jucer_AnimatedComponentTemplate_cpp = (const char*) temp_binary_data_0;
 
 //================== jucer_AudioComponentTemplate.cpp ==================
 static const unsigned char temp_binary_data_1[] =
@@ -100,13 +107,11 @@ static const unsigned char temp_binary_data_1[] =
 "{\r\n"
 "public:\r\n"
 "    //==============================================================================\r\n"
-"\r\n"
-"\r\n"
 "    MainContentComponent()\r\n"
 "    {\r\n"
 "        setSize (500, 400);\r\n"
-"        \r\n"
-"        // the the input and output channels (currently Mono in and out)\r\n"
+"\r\n"
+"        // specify the number of input and output channels needed\r\n"
 "        setAudioChannels (1, 1);\r\n"
 "    }\r\n"
 "\r\n"
@@ -114,38 +119,45 @@ static const unsigned char temp_binary_data_1[] =
 "    {\r\n"
 "        shutdownAudio();\r\n"
 "    }\r\n"
-"    \r\n"
+"\r\n"
 "    //=======================================================================\r\n"
-"    // HANDLE AUDIO\r\n"
-"    \r\n"
-"    void prepareToPlay (int samplesPerBlockExpected, double sampleRate)\r\n"
+"    void prepareToPlay (int samplesPerBlockExpected, double sampleRate) override\r\n"
 "    {\r\n"
-"        // This is called externally with the native paramters when the\r\n"
-"        // device is ready.\r\n"
+"        // This function will be called when the audio device is started, or when\r\n"
+"        // its settings (i.e. sample rate, block size, etc) are changed.\r\n"
+"\r\n"
+"        // You can use this function to initialise any resources you might need,\r\n"
+"        // but be careful - it will be called on the audio thread, not the GUI thread.\r\n"
+"\r\n"
+"        // For more details, see the help for AudioProcessor::prepareToPlay()\r\n"
 "    }\r\n"
-"    \r\n"
-"    void getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill)\r\n"
+"\r\n"
+"    void getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill) override\r\n"
 "    {\r\n"
-"        // Process your Audio here.\r\n"
+"        // Your audio-processing code goes here!\r\n"
+"\r\n"
+"        // For more details, see the help for AudioProcessor::getNextAudioBlock()\r\n"
 "    }\r\n"
-"    \r\n"
-"    void releaseResources()\r\n"
+"\r\n"
+"    void releaseResources() override\r\n"
 "    {\r\n"
-"        // This gets automatically called when audio device paramters change\r\n"
-"        // or device is restarted.\r\n"
+"        // This will be called when the audio device stops, or when it is being\r\n"
+"        // restarted due to a setting change.\r\n"
+"\r\n"
+"        // For more details, see the help for AudioProcessor::releaseResources()\r\n"
 "    }\r\n"
-"    \r\n"
+"\r\n"
 "    //=======================================================================\r\n"
-"    // HANDLE DRAWING\r\n"
-"    \r\n"
-"    void paint (Graphics& g)\r\n"
+"    void paint (Graphics& g) override\r\n"
 "    {\r\n"
-"        // fill background\r\n"
+"        // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n"
 "        g.fillAll (Colours::black);\r\n"
 "\r\n"
+"\r\n"
+"        // You can add your drawing code here!\r\n"
 "    }\r\n"
 "\r\n"
-"    void resized()\r\n"
+"    void resized() override\r\n"
 "    {\r\n"
 "        // This is called when the MainContentComponent is resized.\r\n"
 "        // If you add any child components, this is where you should\r\n"
@@ -155,360 +167,24 @@ static const unsigned char temp_binary_data_1[] =
 "\r\n"
 "private:\r\n"
 "    //==============================================================================\r\n"
-"    \r\n"
-"    // private member variables\r\n"
-"    \r\n"
-"    \r\n"
-"    \r\n"
+"\r\n"
+"    // Your private member variables go here...\r\n"
+"\r\n"
+"\r\n"
 "    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent)\r\n"
 "};\r\n"
 "\r\n"
 "\r\n"
-"Component* createMainContentComponent() { return new MainContentComponent(); };\r\n"
+"// (This function is called by the app startup code to create our main component)\r\n"
+"Component* createMainContentComponent()     { return new MainContentComponent(); }\r\n"
 "\r\n"
-"#endif  // MAINCOMPONENT_H_INCLUDED";
-
-const char* jucer_AudioComponentTemplate_cpp = (const char*) temp_binary_data_1;
-
-//================== jucer_MainTemplate_SimpleWindow.cpp ==================
-static const unsigned char temp_binary_data_2[] =
-"/*\r\n"
-"  ==============================================================================\r\n"
-"\r\n"
-"    This file was auto-generated by the Introjucer!\r\n"
-"\r\n"
-"    It contains the basic startup code for a Juce application.\r\n"
-"\r\n"
-"  ==============================================================================\r\n"
-"*/\r\n"
-"\r\n"
-"APPHEADERS\r\n"
-"\r\n"
-"Component* createMainContentComponent();\r\n"
-"\r\n"
-"//==============================================================================\r\n"
-"class APPCLASSNAME  : public JUCEApplication\r\n"
-"{\r\n"
-"public:\r\n"
-"    //==============================================================================\r\n"
-"    APPCLASSNAME() {}\r\n"
-"\r\n"
-"    const String getApplicationName() override       { return ProjectInfo::projectName; }\r\n"
-"    const String getApplicationVersion() override    { return ProjectInfo::versionString; }\r\n"
-"    bool moreThanOneInstanceAllowed() override       { return ALLOWMORETHANONEINSTANCE; }\r\n"
-"\r\n"
-"    //==============================================================================\r\n"
-"    void initialise (const String& commandLine) override\r\n"
-"    {\r\n"
-"        // This method is where you should put your application's initialisation code..\r\n"
-"\r\n"
-"        mainWindow = new MainWindow (getApplicationName());\r\n"
-"    }\r\n"
-"\r\n"
-"    void shutdown() override\r\n"
-"    {\r\n"
-"        // Add your application's shutdown code here..\r\n"
-"\r\n"
-"        mainWindow = nullptr; // (deletes our window)\r\n"
-"    }\r\n"
-"\r\n"
-"    //==============================================================================\r\n"
-"    void systemRequestedQuit() override\r\n"
-"    {\r\n"
-"        // This is called when the app is being asked to quit: you can ignore this\r\n"
-"        // request and let the app carry on running, or call quit() to allow the app to close.\r\n"
-"        quit();\r\n"
-"    }\r\n"
-"\r\n"
-"    void anotherInstanceStarted (const String& commandLine) override\r\n"
-"    {\r\n"
-"        // When another instance of the app is launched while this one is running,\r\n"
-"        // this method is invoked, and the commandLine parameter tells you what\r\n"
-"        // the other instance's command-line arguments were.\r\n"
-"    }\r\n"
-"\r\n"
-"    //==============================================================================\r\n"
-"    /*\r\n"
-"        This class implements the desktop window that contains an instance of\r\n"
-"        our CONTENTCOMPCLASS class.\r\n"
-"    */\r\n"
-"    class MainWindow    : public DocumentWindow\r\n"
-"    {\r\n"
-"    public:\r\n"
-"        MainWindow (String name)  : DocumentWindow (name,\r\n"
-"                                                    Colours::lightgrey,\r\n"
-"                                                    DocumentWindow::allButtons)\r\n"
-"        {\r\n"
-"            setUsingNativeTitleBar (true);\r\n"
-"            setContentOwned (createMainContentComponent(), true);\r\n"
-"            setResizable (true, true);\r\n"
-"\r\n"
-"            centreWithSize (getWidth(), getHeight());\r\n"
-"            setVisible (true);\r\n"
-"        }\r\n"
-"\r\n"
-"        void closeButtonPressed() override\r\n"
-"        {\r\n"
-"            // This is called when the user tries to close this window. Here, we'll just\r\n"
-"            // ask the app to quit when this happens, but you can change this to do\r\n"
-"            // whatever you need.\r\n"
-"            JUCEApplication::getInstance()->systemRequestedQuit();\r\n"
-"        }\r\n"
-"\r\n"
-"        /* Note: Be careful if you override any DocumentWindow methods - the base\r\n"
-"           class uses a lot of them, so by overriding you might break its functionality.\r\n"
-"           It's best to do all your work in your content component instead, but if\r\n"
-"           you really have to override any DocumentWindow methods, make sure your\r\n"
-"           subclass also calls the superclass's method.\r\n"
-"        */\r\n"
-"\r\n"
-"    private:\r\n"
-"        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow)\r\n"
-"    };\r\n"
-"\r\n"
-"private:\r\n"
-"    ScopedPointer<MainWindow> mainWindow;\r\n"
-"};\r\n"
-"\r\n"
-"//==============================================================================\r\n"
-"// This macro generates the main() routine that launches the app.\r\n"
-"START_JUCE_APPLICATION (APPCLASSNAME)\r\n";
-
-const char* jucer_MainTemplate_SimpleWindow_cpp = (const char*) temp_binary_data_2;
-
-//================== jucer_AnimatedComponentTemplate.cpp ==================
-static const unsigned char temp_binary_data_3[] =
-"/*\r\n"
-"  ==============================================================================\r\n"
-"\r\n"
-"    This file was auto-generated!\r\n"
-"\r\n"
-"  ==============================================================================\r\n"
-"*/\r\n"
-"\r\n"
-"#ifndef MAINCOMPONENT_H_INCLUDED\r\n"
-"#define MAINCOMPONENT_H_INCLUDED\r\n"
-"\r\n"
-"INCLUDE_JUCE\r\n"
-"\r\n"
-"//==============================================================================\r\n"
-"/*\r\n"
-"    This component lives inside our window, and this is where you should put all\r\n"
-"    your controls and content.\r\n"
-"*/\r\n"
-"class MainContentComponent   : public AnimatedAppComponent\r\n"
-"{\r\n"
-"public:\r\n"
-"    //==============================================================================\r\n"
-"\r\n"
-"\r\n"
-"    MainContentComponent()\r\n"
-"    {\r\n"
-"        setSize (500, 400);\r\n"
-"        setFramesPerSecond (60);\r\n"
-"    }\r\n"
-"\r\n"
-"    ~MainContentComponent()\r\n"
-"    {\r\n"
-"    }\r\n"
-"\r\n"
-"    void update()\r\n"
-"    {\r\n"
-"        \r\n"
-"    }\r\n"
-"    \r\n"
-"    void paint (Graphics& g)\r\n"
-"    {\r\n"
-"        // fill background\r\n"
-"        g.fillAll (Colours::black);\r\n"
-"\r\n"
-"    }\r\n"
-"\r\n"
-"    void resized()\r\n"
-"    {\r\n"
-"        // This is called when the MainContentComponent is resized.\r\n"
-"        // If you add any child components, this is where you should\r\n"
-"        // update their positions.\r\n"
-"    }\r\n"
-"\r\n"
-"\r\n"
-"private:\r\n"
-"    //==============================================================================\r\n"
-"    \r\n"
-"    // private member variables\r\n"
-"    \r\n"
-"    \r\n"
-"    \r\n"
-"    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent)\r\n"
-"};\r\n"
-"\r\n"
-"\r\n"
-"Component* createMainContentComponent() { return new MainContentComponent(); };\r\n"
 "\r\n"
 "#endif  // MAINCOMPONENT_H_INCLUDED\r\n";
 
-const char* jucer_AnimatedComponentTemplate_cpp = (const char*) temp_binary_data_3;
-
-//================== AudioPluginXCodeScript.txt ==================
-static const unsigned char temp_binary_data_4[] =
-"\r\n"
-"# This script takes the build product and copies it to the AU, VST, VST3, RTAS and AAX folders, depending on \r\n"
-"# which plugin types you've built\r\n"
-"\r\n"
-"original=$CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME\r\n"
-"\r\n"
-"# this looks inside the binary to detect which platforms are needed.. \r\n"
-"copyAU=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'AudioUnit' | wc -l`\r\n"
-"copyVST=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'VSTPlugin' | wc -l`\r\n"
-"copyVST3=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'GetPluginFactory' | wc -l`\r\n"
-"copyRTAS=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'CProcess' | wc -l`\r\n"
-"copyAAX=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'ACFStartup' | wc -l`\r\n"
-"\r\n"
-"if [ $copyAU -gt 0 ]; then\r\n"
-"  echo \"Copying to AudioUnit folder...\"\r\n"
-"  AU=~/Library/Audio/Plug-Ins/Components/$PRODUCT_NAME.component\r\n"
-"  if [ -d \"$AU\" ]; then \r\n"
-"    rm -r \"$AU\"\r\n"
-"  fi\r\n"
-"\r\n"
-"  cp -r \"$original\" \"$AU\"\r\n"
-"  sed -i \"\" -e 's/TDMwPTul/BNDLPTul/g' \"$AU/Contents/PkgInfo\"\r\n"
-"  sed -i \"\" -e 's/TDMw/BNDL/g' \"$AU/Contents/$INFOPLIST_FILE\"\r\n"
-"\r\n"
-"  # Fix info.plist for AUs built with Xcode 3\r\n"
-"  if [ -f \"$DEVELOPER_DIR/Library/Developer/CoreAudio/AudioUnits/AUPublic/AUBase/AUPlugInDispatch.cpp\" ]; then\r\n"
-"    echo\r\n"
-"  else\r\n"
-"    echo \"Removing AudioComponents entry from Info.plist because this is not a new-format AU\"\r\n"
-"    /usr/libexec/PlistBuddy -c \"Delete AudioComponents\" \"$AU/Contents/Info.plist\"\r\n"
-"  fi\r\n"
-"fi\r\n"
-"\r\n"
-"if [ $copyVST -gt 0 ]; then\r\n"
-"  echo \"Copying to VST folder...\"\r\n"
-"  VST=~/Library/Audio/Plug-Ins/VST/$PRODUCT_NAME.vst\r\n"
-"  if [ -d \"$VST\" ]; then \r\n"
-"    rm -r \"$VST\"\r\n"
-"  fi\r\n"
-"\r\n"
-"  cp -r \"$original\" \"$VST\"\r\n"
-"  sed -i \"\" -e 's/TDMwPTul/BNDLPTul/g' \"$VST/Contents/PkgInfo\"\r\n"
-"  sed -i \"\" -e 's/TDMw/BNDL/g' \"$VST/Contents/$INFOPLIST_FILE\"\r\n"
-"fi\r\n"
-"\r\n"
-"if [ $copyVST3 -gt 0 ]; then\r\n"
-"  echo \"Copying to VST3 folder...\"\r\n"
-"  VST3=~/Library/Audio/Plug-Ins/VST3/$PRODUCT_NAME.vst3\r\n"
-"  if [ -d \"$VST3\" ]; then \r\n"
-"    rm -r \"$VST3\"\r\n"
-"  fi\r\n"
-"\r\n"
-"  cp -r \"$original\" \"$VST3\"\r\n"
-"  sed -i \"\" -e 's/TDMwPTul/BNDLPTul/g' \"$VST3/Contents/PkgInfo\"\r\n"
-"  sed -i \"\" -e 's/TDMw/BNDL/g' \"$VST3/Contents/$INFOPLIST_FILE\"\r\n"
-"fi\r\n"
-"\r\n"
-"if [ $copyRTAS -gt 0 ]; then\r\n"
-"  echo \"Copying to RTAS folder...\"\r\n"
-"  RTAS=/Library/Application\\ Support/Digidesign/Plug-Ins/$PRODUCT_NAME.dpm\r\n"
-"  if [ -d \"$RTAS\" ]; then\r\n"
-"    rm -r \"$RTAS\"\r\n"
-"  fi\r\n"
-"\r\n"
-"  cp -r \"$original\" \"$RTAS\"\r\n"
-"fi\r\n"
-"\r\n"
-"if [ $copyAAX -gt 0 ]; then\r\n"
-"  echo \"Copying to AAX folder...\"\r\n"
-"\r\n"
-"  if [ -d \"/Applications/ProTools_3PDev/Plug-Ins\" ]; then\r\n"
-"    AAX1=\"/Applications/ProTools_3PDev/Plug-Ins/$PRODUCT_NAME.aaxplugin\"\r\n"
-"\r\n"
-"    if [ -d \"$AAX1\" ]; then\r\n"
-"      rm -r \"$AAX1\"\r\n"
-"    fi\r\n"
-"\r\n"
-"    cp -R -H \"$original\" \"$AAX1\"\r\n"
-"  fi\r\n"
-"\r\n"
-"  if [ -d \"/Library/Application Support/Avid/Audio/Plug-Ins\" ]; then\r\n"
-"    AAX2=\"/Library/Application Support/Avid/Audio/Plug-Ins/$PRODUCT_NAME.aaxplugin\"\r\n"
-"\r\n"
-"    if [ -d \"$AAX2\" ]; then\r\n"
-"      rm -r \"$AAX2\"\r\n"
-"    fi\r\n"
-"\r\n"
-"    cp -R -H \"$original\" \"$AAX2\"\r\n"
-"  fi\r\n"
-"fi\r\n";
-
-const char* AudioPluginXCodeScript_txt = (const char*) temp_binary_data_4;
-
-//================== background_tile.png ==================
-static const unsigned char temp_binary_data_5[] =
-{ 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,7,0,0,0,7,8,6,0,0,0,196,82,87,211,0,0,0,94,73,68,65,84,120,218,85,141,73,14,0,33,8,4,253,137,226,18,19,245,234,255,127,70,75,155,232,56,135,10,132,94,112,33,4,37,222,123,205,57,107,74,105,239,196,137,
-8,72,239,29,99,12,204,57,209,90,227,237,19,45,113,161,209,12,234,172,18,49,70,88,229,134,34,103,173,245,159,60,134,82,10,238,79,166,223,106,238,91,100,229,73,191,80,92,47,179,68,223,148,158,98,226,0,0,0,0,73,69,78,68,174,66,96,130,0,0 };
-
-const char* background_tile_png = (const char*) temp_binary_data_5;
-
-//================== colourscheme_dark.xml ==================
-static const unsigned char temp_binary_data_6[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
-"\r\n"
-"<COLOUR_SCHEME font=\"&lt;Monospaced&gt;; 13.0\">\r\n"
-"  <COLOUR name=\"Main Window Bkgd\" colour=\"FF29292A\"/>\r\n"
-"  <COLOUR name=\"Treeview Highlight\" colour=\"2BFFFEC3\"/>\r\n"
-"  <COLOUR name=\"Code Background\" colour=\"FF222222\"/>\r\n"
-"  <COLOUR name=\"Line Number Bkgd\" colour=\"44C1C1C1\"/>\r\n"
-"  <COLOUR name=\"Line Numbers\" colour=\"E9B2B2B2\"/>\r\n"
-"  <COLOUR name=\"Plain Text\" colour=\"FFCECECE\"/>\r\n"
-"  <COLOUR name=\"Selected Text Bkgd\" colour=\"FF2859AC\"/>\r\n"
-"  <COLOUR name=\"Caret\" colour=\"FFFFFFFF\"/>\r\n"
-"  <COLOUR name=\"Preprocessor Text\" colour=\"FFF8F631\"/>\r\n"
-"  <COLOUR name=\"Punctuation\" colour=\"FFCFBEFF\"/>\r\n"
-"  <COLOUR name=\"Bracket\" colour=\"FF058202\"/>\r\n"
-"  <COLOUR name=\"String\" colour=\"FFBC45DD\"/>\r\n"
-"  <COLOUR name=\"Float\" colour=\"ff885500\"/>\r\n"
-"  <COLOUR name=\"Integer\" colour=\"FF42C8C4\"/>\r\n"
-"  <COLOUR name=\"Identifier\" colour=\"FFCFCFCF\"/>\r\n"
-"  <COLOUR name=\"Operator\" colour=\"FFC4EB19\"/>\r\n"
-"  <COLOUR name=\"Keyword\" colour=\"FFEE6F6F\"/>\r\n"
-"  <COLOUR name=\"Comment\" colour=\"FF72D20C\"/>\r\n"
-"  <COLOUR name=\"Error\" colour=\"FFE60000\"/>\r\n"
-"</COLOUR_SCHEME>\r\n";
-
-const char* colourscheme_dark_xml = (const char*) temp_binary_data_6;
-
-//================== colourscheme_light.xml ==================
-static const unsigned char temp_binary_data_7[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
-"\r\n"
-"<COLOUR_SCHEME font=\"&lt;Monospaced&gt;; 13.0\">\r\n"
-"  <COLOUR name=\"Main Window Bkgd\" colour=\"FFE6E7E9\"/>\r\n"
-"  <COLOUR name=\"Treeview Highlight\" colour=\"401111ee\"/>\r\n"
-"  <COLOUR name=\"Code Background\" colour=\"ffffffff\"/>\r\n"
-"  <COLOUR name=\"Line Number Bkgd\" colour=\"44999999\"/>\r\n"
-"  <COLOUR name=\"Line Numbers\" colour=\"44000000\"/>\r\n"
-"  <COLOUR name=\"Plain Text\" colour=\"ff000000\"/>\r\n"
-"  <COLOUR name=\"Selected Text Bkgd\" colour=\"401111ee\"/>\r\n"
-"  <COLOUR name=\"Caret\" colour=\"ff000000\"/>\r\n"
-"  <COLOUR name=\"Preprocessor Text\" colour=\"ff660000\"/>\r\n"
-"  <COLOUR name=\"Punctuation\" colour=\"ff004400\"/>\r\n"
-"  <COLOUR name=\"Bracket\" colour=\"ff000055\"/>\r\n"
-"  <COLOUR name=\"String\" colour=\"ff990099\"/>\r\n"
-"  <COLOUR name=\"Float\" colour=\"ff885500\"/>\r\n"
-"  <COLOUR name=\"Integer\" colour=\"ff880000\"/>\r\n"
-"  <COLOUR name=\"Identifier\" colour=\"ff000000\"/>\r\n"
-"  <COLOUR name=\"Operator\" colour=\"ff225500\"/>\r\n"
-"  <COLOUR name=\"Keyword\" colour=\"ff0000cc\"/>\r\n"
-"  <COLOUR name=\"Comment\" colour=\"ff00aa00\"/>\r\n"
-"  <COLOUR name=\"Error\" colour=\"ffcc0000\"/>\r\n"
-"</COLOUR_SCHEME>\r\n";
-
-const char* colourscheme_light_xml = (const char*) temp_binary_data_7;
+const char* jucer_AudioComponentTemplate_cpp = (const char*) temp_binary_data_1;
 
 //================== jucer_AudioPluginEditorTemplate.cpp ==================
-static const unsigned char temp_binary_data_8[] =
+static const unsigned char temp_binary_data_2[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -551,10 +227,10 @@ static const unsigned char temp_binary_data_8[] =
 "    // subcomponents in your editor..\r\n"
 "}\r\n";
 
-const char* jucer_AudioPluginEditorTemplate_cpp = (const char*) temp_binary_data_8;
+const char* jucer_AudioPluginEditorTemplate_cpp = (const char*) temp_binary_data_2;
 
 //================== jucer_AudioPluginEditorTemplate.h ==================
-static const unsigned char temp_binary_data_9[] =
+static const unsigned char temp_binary_data_3[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -595,10 +271,10 @@ static const unsigned char temp_binary_data_9[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* jucer_AudioPluginEditorTemplate_h = (const char*) temp_binary_data_9;
+const char* jucer_AudioPluginEditorTemplate_h = (const char*) temp_binary_data_3;
 
 //================== jucer_AudioPluginFilterTemplate.cpp ==================
-static const unsigned char temp_binary_data_10[] =
+static const unsigned char temp_binary_data_4[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -789,10 +465,10 @@ static const unsigned char temp_binary_data_10[] =
 "    return new FILTERCLASSNAME();\r\n"
 "}\r\n";
 
-const char* jucer_AudioPluginFilterTemplate_cpp = (const char*) temp_binary_data_10;
+const char* jucer_AudioPluginFilterTemplate_cpp = (const char*) temp_binary_data_4;
 
 //================== jucer_AudioPluginFilterTemplate.h ==================
-static const unsigned char temp_binary_data_11[] =
+static const unsigned char temp_binary_data_5[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -868,10 +544,10 @@ static const unsigned char temp_binary_data_11[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* jucer_AudioPluginFilterTemplate_h = (const char*) temp_binary_data_11;
+const char* jucer_AudioPluginFilterTemplate_h = (const char*) temp_binary_data_5;
 
 //================== jucer_ComponentTemplate.cpp ==================
-static const unsigned char temp_binary_data_12[] =
+static const unsigned char temp_binary_data_6[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -944,10 +620,10 @@ static const unsigned char temp_binary_data_12[] =
 "//[EndFile] You can add extra defines here...\r\n"
 "//[/EndFile]";
 
-const char* jucer_ComponentTemplate_cpp = (const char*) temp_binary_data_12;
+const char* jucer_ComponentTemplate_cpp = (const char*) temp_binary_data_6;
 
 //================== jucer_ComponentTemplate.h ==================
-static const unsigned char temp_binary_data_13[] =
+static const unsigned char temp_binary_data_7[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1013,10 +689,10 @@ static const unsigned char temp_binary_data_13[] =
 "\r\n"
 "#endif   // %%headerGuard%%";
 
-const char* jucer_ComponentTemplate_h = (const char*) temp_binary_data_13;
+const char* jucer_ComponentTemplate_h = (const char*) temp_binary_data_7;
 
 //================== jucer_ContentCompTemplate.cpp ==================
-static const unsigned char temp_binary_data_14[] =
+static const unsigned char temp_binary_data_8[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1054,10 +730,10 @@ static const unsigned char temp_binary_data_14[] =
 "    // update their positions.\r\n"
 "}\r\n";
 
-const char* jucer_ContentCompTemplate_cpp = (const char*) temp_binary_data_14;
+const char* jucer_ContentCompTemplate_cpp = (const char*) temp_binary_data_8;
 
 //================== jucer_ContentCompTemplate.h ==================
-static const unsigned char temp_binary_data_15[] =
+static const unsigned char temp_binary_data_9[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1095,10 +771,10 @@ static const unsigned char temp_binary_data_15[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* jucer_ContentCompTemplate_h = (const char*) temp_binary_data_15;
+const char* jucer_ContentCompTemplate_h = (const char*) temp_binary_data_9;
 
 //================== jucer_InlineComponentTemplate.h ==================
-static const unsigned char temp_binary_data_16[] =
+static const unsigned char temp_binary_data_10[] =
 "//==============================================================================\r\n"
 "class COMPONENTCLASS    : public Component\r\n"
 "{\r\n"
@@ -1140,10 +816,10 @@ static const unsigned char temp_binary_data_16[] =
 "    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS)\r\n"
 "};\r\n";
 
-const char* jucer_InlineComponentTemplate_h = (const char*) temp_binary_data_16;
+const char* jucer_InlineComponentTemplate_h = (const char*) temp_binary_data_10;
 
 //================== jucer_MainConsoleAppTemplate.cpp ==================
-static const unsigned char temp_binary_data_17[] =
+static const unsigned char temp_binary_data_11[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1167,10 +843,10 @@ static const unsigned char temp_binary_data_17[] =
 "    return 0;\r\n"
 "}\r\n";
 
-const char* jucer_MainConsoleAppTemplate_cpp = (const char*) temp_binary_data_17;
+const char* jucer_MainConsoleAppTemplate_cpp = (const char*) temp_binary_data_11;
 
 //================== jucer_MainTemplate_NoWindow.cpp ==================
-static const unsigned char temp_binary_data_18[] =
+static const unsigned char temp_binary_data_12[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1226,10 +902,116 @@ static const unsigned char temp_binary_data_18[] =
 "// This macro generates the main() routine that launches the app.\r\n"
 "START_JUCE_APPLICATION (APPCLASSNAME)\r\n";
 
-const char* jucer_MainTemplate_NoWindow_cpp = (const char*) temp_binary_data_18;
+const char* jucer_MainTemplate_NoWindow_cpp = (const char*) temp_binary_data_12;
+
+//================== jucer_MainTemplate_SimpleWindow.cpp ==================
+static const unsigned char temp_binary_data_13[] =
+"/*\r\n"
+"  ==============================================================================\r\n"
+"\r\n"
+"    This file was auto-generated by the Introjucer!\r\n"
+"\r\n"
+"    It contains the basic startup code for a Juce application.\r\n"
+"\r\n"
+"  ==============================================================================\r\n"
+"*/\r\n"
+"\r\n"
+"APPHEADERS\r\n"
+"\r\n"
+"Component* createMainContentComponent();\r\n"
+"\r\n"
+"//==============================================================================\r\n"
+"class APPCLASSNAME  : public JUCEApplication\r\n"
+"{\r\n"
+"public:\r\n"
+"    //==============================================================================\r\n"
+"    APPCLASSNAME() {}\r\n"
+"\r\n"
+"    const String getApplicationName() override       { return ProjectInfo::projectName; }\r\n"
+"    const String getApplicationVersion() override    { return ProjectInfo::versionString; }\r\n"
+"    bool moreThanOneInstanceAllowed() override       { return ALLOWMORETHANONEINSTANCE; }\r\n"
+"\r\n"
+"    //==============================================================================\r\n"
+"    void initialise (const String& commandLine) override\r\n"
+"    {\r\n"
+"        // This method is where you should put your application's initialisation code..\r\n"
+"\r\n"
+"        mainWindow = new MainWindow (getApplicationName());\r\n"
+"    }\r\n"
+"\r\n"
+"    void shutdown() override\r\n"
+"    {\r\n"
+"        // Add your application's shutdown code here..\r\n"
+"\r\n"
+"        mainWindow = nullptr; // (deletes our window)\r\n"
+"    }\r\n"
+"\r\n"
+"    //==============================================================================\r\n"
+"    void systemRequestedQuit() override\r\n"
+"    {\r\n"
+"        // This is called when the app is being asked to quit: you can ignore this\r\n"
+"        // request and let the app carry on running, or call quit() to allow the app to close.\r\n"
+"        quit();\r\n"
+"    }\r\n"
+"\r\n"
+"    void anotherInstanceStarted (const String& commandLine) override\r\n"
+"    {\r\n"
+"        // When another instance of the app is launched while this one is running,\r\n"
+"        // this method is invoked, and the commandLine parameter tells you what\r\n"
+"        // the other instance's command-line arguments were.\r\n"
+"    }\r\n"
+"\r\n"
+"    //==============================================================================\r\n"
+"    /*\r\n"
+"        This class implements the desktop window that contains an instance of\r\n"
+"        our CONTENTCOMPCLASS class.\r\n"
+"    */\r\n"
+"    class MainWindow    : public DocumentWindow\r\n"
+"    {\r\n"
+"    public:\r\n"
+"        MainWindow (String name)  : DocumentWindow (name,\r\n"
+"                                                    Colours::lightgrey,\r\n"
+"                                                    DocumentWindow::allButtons)\r\n"
+"        {\r\n"
+"            setUsingNativeTitleBar (true);\r\n"
+"            setContentOwned (createMainContentComponent(), true);\r\n"
+"            setResizable (true, true);\r\n"
+"\r\n"
+"            centreWithSize (getWidth(), getHeight());\r\n"
+"            setVisible (true);\r\n"
+"        }\r\n"
+"\r\n"
+"        void closeButtonPressed() override\r\n"
+"        {\r\n"
+"            // This is called when the user tries to close this window. Here, we'll just\r\n"
+"            // ask the app to quit when this happens, but you can change this to do\r\n"
+"            // whatever you need.\r\n"
+"            JUCEApplication::getInstance()->systemRequestedQuit();\r\n"
+"        }\r\n"
+"\r\n"
+"        /* Note: Be careful if you override any DocumentWindow methods - the base\r\n"
+"           class uses a lot of them, so by overriding you might break its functionality.\r\n"
+"           It's best to do all your work in your content component instead, but if\r\n"
+"           you really have to override any DocumentWindow methods, make sure your\r\n"
+"           subclass also calls the superclass's method.\r\n"
+"        */\r\n"
+"\r\n"
+"    private:\r\n"
+"        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow)\r\n"
+"    };\r\n"
+"\r\n"
+"private:\r\n"
+"    ScopedPointer<MainWindow> mainWindow;\r\n"
+"};\r\n"
+"\r\n"
+"//==============================================================================\r\n"
+"// This macro generates the main() routine that launches the app.\r\n"
+"START_JUCE_APPLICATION (APPCLASSNAME)\r\n";
+
+const char* jucer_MainTemplate_SimpleWindow_cpp = (const char*) temp_binary_data_13;
 
 //================== jucer_MainTemplate_Window.cpp ==================
-static const unsigned char temp_binary_data_19[] =
+static const unsigned char temp_binary_data_14[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1330,10 +1112,10 @@ static const unsigned char temp_binary_data_19[] =
 "// This macro generates the main() routine that launches the app.\r\n"
 "START_JUCE_APPLICATION (APPCLASSNAME)\r\n";
 
-const char* jucer_MainTemplate_Window_cpp = (const char*) temp_binary_data_19;
+const char* jucer_MainTemplate_Window_cpp = (const char*) temp_binary_data_14;
 
 //================== jucer_NewComponentTemplate.cpp ==================
-static const unsigned char temp_binary_data_20[] =
+static const unsigned char temp_binary_data_15[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1386,10 +1168,10 @@ static const unsigned char temp_binary_data_20[] =
 "\r\n"
 "}\r\n";
 
-const char* jucer_NewComponentTemplate_cpp = (const char*) temp_binary_data_20;
+const char* jucer_NewComponentTemplate_cpp = (const char*) temp_binary_data_15;
 
 //================== jucer_NewComponentTemplate.h ==================
-static const unsigned char temp_binary_data_21[] =
+static const unsigned char temp_binary_data_16[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1424,10 +1206,10 @@ static const unsigned char temp_binary_data_21[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* jucer_NewComponentTemplate_h = (const char*) temp_binary_data_21;
+const char* jucer_NewComponentTemplate_h = (const char*) temp_binary_data_16;
 
 //================== jucer_NewCppFileTemplate.cpp ==================
-static const unsigned char temp_binary_data_22[] =
+static const unsigned char temp_binary_data_17[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1440,10 +1222,10 @@ static const unsigned char temp_binary_data_22[] =
 "\r\n"
 "INCLUDE_CORRESPONDING_HEADER\r\n";
 
-const char* jucer_NewCppFileTemplate_cpp = (const char*) temp_binary_data_22;
+const char* jucer_NewCppFileTemplate_cpp = (const char*) temp_binary_data_17;
 
 //================== jucer_NewCppFileTemplate.h ==================
-static const unsigned char temp_binary_data_23[] =
+static const unsigned char temp_binary_data_18[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1463,10 +1245,10 @@ static const unsigned char temp_binary_data_23[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* jucer_NewCppFileTemplate_h = (const char*) temp_binary_data_23;
+const char* jucer_NewCppFileTemplate_h = (const char*) temp_binary_data_18;
 
 //================== jucer_NewInlineComponentTemplate.h ==================
-static const unsigned char temp_binary_data_24[] =
+static const unsigned char temp_binary_data_19[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -1533,7 +1315,236 @@ static const unsigned char temp_binary_data_24[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* jucer_NewInlineComponentTemplate_h = (const char*) temp_binary_data_24;
+const char* jucer_NewInlineComponentTemplate_h = (const char*) temp_binary_data_19;
+
+//================== jucer_OpenGLComponentTemplate.cpp ==================
+static const unsigned char temp_binary_data_20[] =
+"/*\r\n"
+"  ==============================================================================\r\n"
+"\r\n"
+"    This file was auto-generated!\r\n"
+"\r\n"
+"  ==============================================================================\r\n"
+"*/\r\n"
+"\r\n"
+"#ifndef MAINCOMPONENT_H_INCLUDED\r\n"
+"#define MAINCOMPONENT_H_INCLUDED\r\n"
+"\r\n"
+"INCLUDE_JUCE\r\n"
+"\r\n"
+"//==============================================================================\r\n"
+"/*\r\n"
+"    This component lives inside our window, and this is where you should put all\r\n"
+"    your controls and content.\r\n"
+"*/\r\n"
+"class MainContentComponent   : public OpenGLAppComponent\r\n"
+"{\r\n"
+"public:\r\n"
+"    //==============================================================================\r\n"
+"    MainContentComponent()\r\n"
+"    {\r\n"
+"        setSize (500, 400);\r\n"
+"\r\n"
+"    }\r\n"
+"\r\n"
+"    ~MainContentComponent()\r\n"
+"    {\r\n"
+"        shutdownAudio();\r\n"
+"    }\r\n"
+"\r\n"
+"    void paint (Graphics& g)\r\n"
+"    {\r\n"
+"        // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n"
+"        g.fillAll (Colours::black);\r\n"
+"\r\n"
+"\r\n"
+"        // You can add your drawing code here!\r\n"
+"    }\r\n"
+"\r\n"
+"    void resized()\r\n"
+"    {\r\n"
+"        // This is called when the MainContentComponent is resized.\r\n"
+"        // If you add any child components, this is where you should\r\n"
+"        // update their positions.\r\n"
+"    }\r\n"
+"\r\n"
+"\r\n"
+"private:\r\n"
+"    //==============================================================================\r\n"
+"\r\n"
+"    // private member variables\r\n"
+"\r\n"
+"\r\n"
+"\r\n"
+"    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent)\r\n"
+"};\r\n"
+"\r\n"
+"\r\n"
+"// (This function is called by the app startup code to create our main component)\r\n"
+"Component* createMainContentComponent()    { return new MainContentComponent(); }\r\n"
+"\r\n"
+"\r\n"
+"#endif  // MAINCOMPONENT_H_INCLUDED\r\n";
+
+const char* jucer_OpenGLComponentTemplate_cpp = (const char*) temp_binary_data_20;
+
+//================== AudioPluginXCodeScript.txt ==================
+static const unsigned char temp_binary_data_21[] =
+"\r\n"
+"# This script takes the build product and copies it to the AU, VST, VST3, RTAS and AAX folders, depending on \r\n"
+"# which plugin types you've built\r\n"
+"\r\n"
+"original=$CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME\r\n"
+"\r\n"
+"# this looks inside the binary to detect which platforms are needed.. \r\n"
+"copyAU=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'AudioUnit' | wc -l`\r\n"
+"copyVST=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'VSTPlugin' | wc -l`\r\n"
+"copyVST3=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'GetPluginFactory' | wc -l`\r\n"
+"copyRTAS=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'CProcess' | wc -l`\r\n"
+"copyAAX=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'ACFStartup' | wc -l`\r\n"
+"\r\n"
+"if [ $copyAU -gt 0 ]; then\r\n"
+"  echo \"Copying to AudioUnit folder...\"\r\n"
+"  AU=~/Library/Audio/Plug-Ins/Components/$PRODUCT_NAME.component\r\n"
+"  if [ -d \"$AU\" ]; then \r\n"
+"    rm -r \"$AU\"\r\n"
+"  fi\r\n"
+"\r\n"
+"  cp -r \"$original\" \"$AU\"\r\n"
+"  sed -i \"\" -e 's/TDMwPTul/BNDLPTul/g' \"$AU/Contents/PkgInfo\"\r\n"
+"  sed -i \"\" -e 's/TDMw/BNDL/g' \"$AU/Contents/$INFOPLIST_FILE\"\r\n"
+"\r\n"
+"  # Fix info.plist for AUs built with Xcode 3\r\n"
+"  if [ -f \"$DEVELOPER_DIR/Library/Developer/CoreAudio/AudioUnits/AUPublic/AUBase/AUPlugInDispatch.cpp\" ]; then\r\n"
+"    echo\r\n"
+"  else\r\n"
+"    echo \"Removing AudioComponents entry from Info.plist because this is not a new-format AU\"\r\n"
+"    /usr/libexec/PlistBuddy -c \"Delete AudioComponents\" \"$AU/Contents/Info.plist\"\r\n"
+"  fi\r\n"
+"fi\r\n"
+"\r\n"
+"if [ $copyVST -gt 0 ]; then\r\n"
+"  echo \"Copying to VST folder...\"\r\n"
+"  VST=~/Library/Audio/Plug-Ins/VST/$PRODUCT_NAME.vst\r\n"
+"  if [ -d \"$VST\" ]; then \r\n"
+"    rm -r \"$VST\"\r\n"
+"  fi\r\n"
+"\r\n"
+"  cp -r \"$original\" \"$VST\"\r\n"
+"  sed -i \"\" -e 's/TDMwPTul/BNDLPTul/g' \"$VST/Contents/PkgInfo\"\r\n"
+"  sed -i \"\" -e 's/TDMw/BNDL/g' \"$VST/Contents/$INFOPLIST_FILE\"\r\n"
+"fi\r\n"
+"\r\n"
+"if [ $copyVST3 -gt 0 ]; then\r\n"
+"  echo \"Copying to VST3 folder...\"\r\n"
+"  VST3=~/Library/Audio/Plug-Ins/VST3/$PRODUCT_NAME.vst3\r\n"
+"  if [ -d \"$VST3\" ]; then \r\n"
+"    rm -r \"$VST3\"\r\n"
+"  fi\r\n"
+"\r\n"
+"  cp -r \"$original\" \"$VST3\"\r\n"
+"  sed -i \"\" -e 's/TDMwPTul/BNDLPTul/g' \"$VST3/Contents/PkgInfo\"\r\n"
+"  sed -i \"\" -e 's/TDMw/BNDL/g' \"$VST3/Contents/$INFOPLIST_FILE\"\r\n"
+"fi\r\n"
+"\r\n"
+"if [ $copyRTAS -gt 0 ]; then\r\n"
+"  echo \"Copying to RTAS folder...\"\r\n"
+"  RTAS=/Library/Application\\ Support/Digidesign/Plug-Ins/$PRODUCT_NAME.dpm\r\n"
+"  if [ -d \"$RTAS\" ]; then\r\n"
+"    rm -r \"$RTAS\"\r\n"
+"  fi\r\n"
+"\r\n"
+"  cp -r \"$original\" \"$RTAS\"\r\n"
+"fi\r\n"
+"\r\n"
+"if [ $copyAAX -gt 0 ]; then\r\n"
+"  echo \"Copying to AAX folder...\"\r\n"
+"\r\n"
+"  if [ -d \"/Applications/ProTools_3PDev/Plug-Ins\" ]; then\r\n"
+"    AAX1=\"/Applications/ProTools_3PDev/Plug-Ins/$PRODUCT_NAME.aaxplugin\"\r\n"
+"\r\n"
+"    if [ -d \"$AAX1\" ]; then\r\n"
+"      rm -r \"$AAX1\"\r\n"
+"    fi\r\n"
+"\r\n"
+"    cp -R -H \"$original\" \"$AAX1\"\r\n"
+"  fi\r\n"
+"\r\n"
+"  if [ -d \"/Library/Application Support/Avid/Audio/Plug-Ins\" ]; then\r\n"
+"    AAX2=\"/Library/Application Support/Avid/Audio/Plug-Ins/$PRODUCT_NAME.aaxplugin\"\r\n"
+"\r\n"
+"    if [ -d \"$AAX2\" ]; then\r\n"
+"      rm -r \"$AAX2\"\r\n"
+"    fi\r\n"
+"\r\n"
+"    cp -R -H \"$original\" \"$AAX2\"\r\n"
+"  fi\r\n"
+"fi\r\n";
+
+const char* AudioPluginXCodeScript_txt = (const char*) temp_binary_data_21;
+
+//================== background_tile.png ==================
+static const unsigned char temp_binary_data_22[] =
+{ 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,7,0,0,0,7,8,6,0,0,0,196,82,87,211,0,0,0,94,73,68,65,84,120,218,85,141,73,14,0,33,8,4,253,137,226,18,19,245,234,255,127,70,75,155,232,56,135,10,132,94,112,33,4,37,222,123,205,57,107,74,105,239,196,137,
+8,72,239,29,99,12,204,57,209,90,227,237,19,45,113,161,209,12,234,172,18,49,70,88,229,134,34,103,173,245,159,60,134,82,10,238,79,166,223,106,238,91,100,229,73,191,80,92,47,179,68,223,148,158,98,226,0,0,0,0,73,69,78,68,174,66,96,130,0,0 };
+
+const char* background_tile_png = (const char*) temp_binary_data_22;
+
+//================== colourscheme_dark.xml ==================
+static const unsigned char temp_binary_data_23[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
+"\r\n"
+"<COLOUR_SCHEME font=\"&lt;Monospaced&gt;; 13.0\">\r\n"
+"  <COLOUR name=\"Main Window Bkgd\" colour=\"FF29292A\"/>\r\n"
+"  <COLOUR name=\"Treeview Highlight\" colour=\"2BFFFEC3\"/>\r\n"
+"  <COLOUR name=\"Code Background\" colour=\"FF222222\"/>\r\n"
+"  <COLOUR name=\"Line Number Bkgd\" colour=\"44C1C1C1\"/>\r\n"
+"  <COLOUR name=\"Line Numbers\" colour=\"E9B2B2B2\"/>\r\n"
+"  <COLOUR name=\"Plain Text\" colour=\"FFCECECE\"/>\r\n"
+"  <COLOUR name=\"Selected Text Bkgd\" colour=\"FF2859AC\"/>\r\n"
+"  <COLOUR name=\"Caret\" colour=\"FFFFFFFF\"/>\r\n"
+"  <COLOUR name=\"Preprocessor Text\" colour=\"FFF8F631\"/>\r\n"
+"  <COLOUR name=\"Punctuation\" colour=\"FFCFBEFF\"/>\r\n"
+"  <COLOUR name=\"Bracket\" colour=\"FF058202\"/>\r\n"
+"  <COLOUR name=\"String\" colour=\"FFBC45DD\"/>\r\n"
+"  <COLOUR name=\"Float\" colour=\"ff885500\"/>\r\n"
+"  <COLOUR name=\"Integer\" colour=\"FF42C8C4\"/>\r\n"
+"  <COLOUR name=\"Identifier\" colour=\"FFCFCFCF\"/>\r\n"
+"  <COLOUR name=\"Operator\" colour=\"FFC4EB19\"/>\r\n"
+"  <COLOUR name=\"Keyword\" colour=\"FFEE6F6F\"/>\r\n"
+"  <COLOUR name=\"Comment\" colour=\"FF72D20C\"/>\r\n"
+"  <COLOUR name=\"Error\" colour=\"FFE60000\"/>\r\n"
+"</COLOUR_SCHEME>\r\n";
+
+const char* colourscheme_dark_xml = (const char*) temp_binary_data_23;
+
+//================== colourscheme_light.xml ==================
+static const unsigned char temp_binary_data_24[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
+"\r\n"
+"<COLOUR_SCHEME font=\"&lt;Monospaced&gt;; 13.0\">\r\n"
+"  <COLOUR name=\"Main Window Bkgd\" colour=\"FFE6E7E9\"/>\r\n"
+"  <COLOUR name=\"Treeview Highlight\" colour=\"401111ee\"/>\r\n"
+"  <COLOUR name=\"Code Background\" colour=\"ffffffff\"/>\r\n"
+"  <COLOUR name=\"Line Number Bkgd\" colour=\"44999999\"/>\r\n"
+"  <COLOUR name=\"Line Numbers\" colour=\"44000000\"/>\r\n"
+"  <COLOUR name=\"Plain Text\" colour=\"ff000000\"/>\r\n"
+"  <COLOUR name=\"Selected Text Bkgd\" colour=\"401111ee\"/>\r\n"
+"  <COLOUR name=\"Caret\" colour=\"ff000000\"/>\r\n"
+"  <COLOUR name=\"Preprocessor Text\" colour=\"ff660000\"/>\r\n"
+"  <COLOUR name=\"Punctuation\" colour=\"ff004400\"/>\r\n"
+"  <COLOUR name=\"Bracket\" colour=\"ff000055\"/>\r\n"
+"  <COLOUR name=\"String\" colour=\"ff990099\"/>\r\n"
+"  <COLOUR name=\"Float\" colour=\"ff885500\"/>\r\n"
+"  <COLOUR name=\"Integer\" colour=\"ff880000\"/>\r\n"
+"  <COLOUR name=\"Identifier\" colour=\"ff000000\"/>\r\n"
+"  <COLOUR name=\"Operator\" colour=\"ff225500\"/>\r\n"
+"  <COLOUR name=\"Keyword\" colour=\"ff0000cc\"/>\r\n"
+"  <COLOUR name=\"Comment\" colour=\"ff00aa00\"/>\r\n"
+"  <COLOUR name=\"Error\" colour=\"ffcc0000\"/>\r\n"
+"</COLOUR_SCHEME>\r\n";
+
+const char* colourscheme_light_xml = (const char*) temp_binary_data_24;
 
 //================== projectIconAndroid.png ==================
 static const unsigned char temp_binary_data_25[] =
@@ -3616,14 +3627,8 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
 
     switch (hash)
     {
-        case 0x96a53e52:  numBytes = 1495; return jucer_OpenglComponentTemplate_cpp;
-        case 0xafccbd3f:  numBytes = 2308; return jucer_AudioComponentTemplate_cpp;
-        case 0xda2391f8:  numBytes = 3866; return jucer_MainTemplate_SimpleWindow_cpp;
-        case 0x6cf2645e:  numBytes = 1546; return jucer_AnimatedComponentTemplate_cpp;
-        case 0x44be9398:  numBytes = 2922; return AudioPluginXCodeScript_txt;
-        case 0x4a0cfd09:  numBytes = 151; return background_tile_png;
-        case 0x763d39dc:  numBytes = 1050; return colourscheme_dark_xml;
-        case 0xe8b08520:  numBytes = 1050; return colourscheme_light_xml;
+        case 0x6cf2645e:  numBytes = 1908; return jucer_AnimatedComponentTemplate_cpp;
+        case 0xafccbd3f:  numBytes = 2977; return jucer_AudioComponentTemplate_cpp;
         case 0x27c5a93a:  numBytes = 1180; return jucer_AudioPluginEditorTemplate_cpp;
         case 0x4d0721bf:  numBytes = 1012; return jucer_AudioPluginEditorTemplate_h;
         case 0x51b49ac5:  numBytes = 5039; return jucer_AudioPluginFilterTemplate_cpp;
@@ -3635,12 +3640,18 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
         case 0x28d496ad:  numBytes = 1143; return jucer_InlineComponentTemplate_h;
         case 0x8905395b:  numBytes = 470; return jucer_MainConsoleAppTemplate_cpp;
         case 0x5e5ea047:  numBytes = 2010; return jucer_MainTemplate_NoWindow_cpp;
+        case 0xda2391f8:  numBytes = 3866; return jucer_MainTemplate_SimpleWindow_cpp;
         case 0x400bc026:  numBytes = 3778; return jucer_MainTemplate_Window_cpp;
         case 0xf4842835:  numBytes = 1389; return jucer_NewComponentTemplate_cpp;
         case 0xe7bf237a:  numBytes = 648; return jucer_NewComponentTemplate_h;
         case 0x02a2a077:  numBytes = 262; return jucer_NewCppFileTemplate_cpp;
         case 0x0842c43c:  numBytes = 308; return jucer_NewCppFileTemplate_h;
         case 0x36e634a1:  numBytes = 1626; return jucer_NewInlineComponentTemplate_h;
+        case 0x7fbac252:  numBytes = 1679; return jucer_OpenGLComponentTemplate_cpp;
+        case 0x44be9398:  numBytes = 2922; return AudioPluginXCodeScript_txt;
+        case 0x4a0cfd09:  numBytes = 151; return background_tile_png;
+        case 0x763d39dc:  numBytes = 1050; return colourscheme_dark_xml;
+        case 0xe8b08520:  numBytes = 1050; return colourscheme_light_xml;
         case 0x507a15c7:  numBytes = 8150; return projectIconAndroid_png;
         case 0xe8e2796f:  numBytes = 11917; return projectIconCodeblocks_png;
         case 0x90374ad6:  numBytes = 16444; return projectIconLinuxMakefile_png;
@@ -3671,14 +3682,8 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
 
 const char* namedResourceList[] =
 {
-    "jucer_OpenglComponentTemplate_cpp",
-    "jucer_AudioComponentTemplate_cpp",
-    "jucer_MainTemplate_SimpleWindow_cpp",
     "jucer_AnimatedComponentTemplate_cpp",
-    "AudioPluginXCodeScript_txt",
-    "background_tile_png",
-    "colourscheme_dark_xml",
-    "colourscheme_light_xml",
+    "jucer_AudioComponentTemplate_cpp",
     "jucer_AudioPluginEditorTemplate_cpp",
     "jucer_AudioPluginEditorTemplate_h",
     "jucer_AudioPluginFilterTemplate_cpp",
@@ -3690,12 +3695,18 @@ const char* namedResourceList[] =
     "jucer_InlineComponentTemplate_h",
     "jucer_MainConsoleAppTemplate_cpp",
     "jucer_MainTemplate_NoWindow_cpp",
+    "jucer_MainTemplate_SimpleWindow_cpp",
     "jucer_MainTemplate_Window_cpp",
     "jucer_NewComponentTemplate_cpp",
     "jucer_NewComponentTemplate_h",
     "jucer_NewCppFileTemplate_cpp",
     "jucer_NewCppFileTemplate_h",
     "jucer_NewInlineComponentTemplate_h",
+    "jucer_OpenGLComponentTemplate_cpp",
+    "AudioPluginXCodeScript_txt",
+    "background_tile_png",
+    "colourscheme_dark_xml",
+    "colourscheme_light_xml",
     "projectIconAndroid_png",
     "projectIconCodeblocks_png",
     "projectIconLinuxMakefile_png",
diff --git a/extras/Introjucer/JuceLibraryCode/BinaryData.h b/extras/Introjucer/JuceLibraryCode/BinaryData.h
index c49d6d7c55..221cad38a9 100644
--- a/extras/Introjucer/JuceLibraryCode/BinaryData.h
+++ b/extras/Introjucer/JuceLibraryCode/BinaryData.h
@@ -9,29 +9,11 @@
 
 namespace BinaryData
 {
-    extern const char*   jucer_OpenglComponentTemplate_cpp;
-    const int            jucer_OpenglComponentTemplate_cppSize = 1495;
+    extern const char*   jucer_AnimatedComponentTemplate_cpp;
+    const int            jucer_AnimatedComponentTemplate_cppSize = 1908;
 
     extern const char*   jucer_AudioComponentTemplate_cpp;
-    const int            jucer_AudioComponentTemplate_cppSize = 2308;
-
-    extern const char*   jucer_MainTemplate_SimpleWindow_cpp;
-    const int            jucer_MainTemplate_SimpleWindow_cppSize = 3866;
-
-    extern const char*   jucer_AnimatedComponentTemplate_cpp;
-    const int            jucer_AnimatedComponentTemplate_cppSize = 1546;
-
-    extern const char*   AudioPluginXCodeScript_txt;
-    const int            AudioPluginXCodeScript_txtSize = 2922;
-
-    extern const char*   background_tile_png;
-    const int            background_tile_pngSize = 151;
-
-    extern const char*   colourscheme_dark_xml;
-    const int            colourscheme_dark_xmlSize = 1050;
-
-    extern const char*   colourscheme_light_xml;
-    const int            colourscheme_light_xmlSize = 1050;
+    const int            jucer_AudioComponentTemplate_cppSize = 2977;
 
     extern const char*   jucer_AudioPluginEditorTemplate_cpp;
     const int            jucer_AudioPluginEditorTemplate_cppSize = 1180;
@@ -66,6 +48,9 @@ namespace BinaryData
     extern const char*   jucer_MainTemplate_NoWindow_cpp;
     const int            jucer_MainTemplate_NoWindow_cppSize = 2010;
 
+    extern const char*   jucer_MainTemplate_SimpleWindow_cpp;
+    const int            jucer_MainTemplate_SimpleWindow_cppSize = 3866;
+
     extern const char*   jucer_MainTemplate_Window_cpp;
     const int            jucer_MainTemplate_Window_cppSize = 3778;
 
@@ -84,6 +69,21 @@ namespace BinaryData
     extern const char*   jucer_NewInlineComponentTemplate_h;
     const int            jucer_NewInlineComponentTemplate_hSize = 1626;
 
+    extern const char*   jucer_OpenGLComponentTemplate_cpp;
+    const int            jucer_OpenGLComponentTemplate_cppSize = 1679;
+
+    extern const char*   AudioPluginXCodeScript_txt;
+    const int            AudioPluginXCodeScript_txtSize = 2922;
+
+    extern const char*   background_tile_png;
+    const int            background_tile_pngSize = 151;
+
+    extern const char*   colourscheme_dark_xml;
+    const int            colourscheme_dark_xmlSize = 1050;
+
+    extern const char*   colourscheme_light_xml;
+    const int            colourscheme_light_xmlSize = 1050;
+
     extern const char*   projectIconAndroid_png;
     const int            projectIconAndroid_pngSize = 8150;
 
diff --git a/extras/Introjucer/Source/BinaryData/jucer_AnimatedComponentTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_AnimatedComponentTemplate.cpp
index 01fdaefec1..da410ff393 100644
--- a/extras/Introjucer/Source/BinaryData/jucer_AnimatedComponentTemplate.cpp
+++ b/extras/Introjucer/Source/BinaryData/jucer_AnimatedComponentTemplate.cpp
@@ -20,8 +20,6 @@ class MainContentComponent   : public AnimatedAppComponent
 {
 public:
     //==============================================================================
-
-
     MainContentComponent()
     {
         setSize (500, 400);
@@ -32,19 +30,22 @@ public:
     {
     }
 
-    void update()
+    void update() override
     {
-
+        // This function is called at the frequency specified by the setFramesPerSecond() call
+        // in the constructor. You can use it
     }
 
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
-        // fill background
+        // (Our component is opaque, so we must completely fill the background with a solid colour)
         g.fillAll (Colours::black);
 
+
+        // You can add your drawing code here!
     }
 
-    void resized()
+    void resized() override
     {
         // This is called when the MainContentComponent is resized.
         // If you add any child components, this is where you should
@@ -55,7 +56,7 @@ public:
 private:
     //==============================================================================
 
-    // private member variables
+    // Your private member variables go here...
 
 
 
@@ -63,6 +64,8 @@ private:
 };
 
 
-Component* createMainContentComponent() { return new MainContentComponent(); };
+// (This function is called by the app startup code to create our main component)
+Component* createMainContentComponent()    { return new MainContentComponent(); }
+
 
 #endif  // MAINCOMPONENT_H_INCLUDED
diff --git a/extras/Introjucer/Source/BinaryData/jucer_AudioComponentTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_AudioComponentTemplate.cpp
index ff992a31f9..763f3134db 100644
--- a/extras/Introjucer/Source/BinaryData/jucer_AudioComponentTemplate.cpp
+++ b/extras/Introjucer/Source/BinaryData/jucer_AudioComponentTemplate.cpp
@@ -20,13 +20,11 @@ class MainContentComponent   : public AudioAppComponent
 {
 public:
     //==============================================================================
-
-
     MainContentComponent()
     {
         setSize (500, 400);
 
-        // the the input and output channels (currently Mono in and out)
+        // specify the number of input and output channels needed
         setAudioChannels (1, 1);
     }
 
@@ -36,36 +34,43 @@ public:
     }
 
     //=======================================================================
-    // HANDLE AUDIO
-
-    void prepareToPlay (int samplesPerBlockExpected, double sampleRate)
+    void prepareToPlay (int samplesPerBlockExpected, double sampleRate) override
     {
-        // This is called externally with the native paramters when the
-        // device is ready.
+        // This function will be called when the audio device is started, or when
+        // its settings (i.e. sample rate, block size, etc) are changed.
+
+        // You can use this function to initialise any resources you might need,
+        // but be careful - it will be called on the audio thread, not the GUI thread.
+
+        // For more details, see the help for AudioProcessor::prepareToPlay()
     }
 
-    void getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill)
+    void getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill) override
     {
-        // Process your Audio here.
+        // Your audio-processing code goes here!
+
+        // For more details, see the help for AudioProcessor::getNextAudioBlock()
     }
 
-    void releaseResources()
+    void releaseResources() override
     {
-        // This gets automatically called when audio device paramters change
-        // or device is restarted.
+        // This will be called when the audio device stops, or when it is being
+        // restarted due to a setting change.
+
+        // For more details, see the help for AudioProcessor::releaseResources()
     }
 
     //=======================================================================
-    // HANDLE DRAWING
-
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
-        // fill background
+        // (Our component is opaque, so we must completely fill the background with a solid colour)
         g.fillAll (Colours::black);
 
+
+        // You can add your drawing code here!
     }
 
-    void resized()
+    void resized() override
     {
         // This is called when the MainContentComponent is resized.
         // If you add any child components, this is where you should
@@ -76,14 +81,15 @@ public:
 private:
     //==============================================================================
 
-    // private member variables
-
+    // Your private member variables go here...
 
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent)
 };
 
 
-Component* createMainContentComponent() { return new MainContentComponent(); };
+// (This function is called by the app startup code to create our main component)
+Component* createMainContentComponent()     { return new MainContentComponent(); }
+
 
 #endif  // MAINCOMPONENT_H_INCLUDED
diff --git a/extras/Introjucer/Source/BinaryData/jucer_OpenglComponentTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_OpenglComponentTemplate.cpp
index 94d519bb90..88eef810b5 100644
--- a/extras/Introjucer/Source/BinaryData/jucer_OpenglComponentTemplate.cpp
+++ b/extras/Introjucer/Source/BinaryData/jucer_OpenglComponentTemplate.cpp
@@ -20,8 +20,6 @@ class MainContentComponent   : public OpenGLAppComponent
 {
 public:
     //==============================================================================
-
-
     MainContentComponent()
     {
         setSize (500, 400);
@@ -35,9 +33,11 @@ public:
 
     void paint (Graphics& g)
     {
-        // fill background
+        // (Our component is opaque, so we must completely fill the background with a solid colour)
         g.fillAll (Colours::black);
 
+
+        // You can add your drawing code here!
     }
 
     void resized()
@@ -59,6 +59,8 @@ private:
 };
 
 
-Component* createMainContentComponent() { return new MainContentComponent(); };
+// (This function is called by the app startup code to create our main component)
+Component* createMainContentComponent()    { return new MainContentComponent(); }
+
 
 #endif  // MAINCOMPONENT_H_INCLUDED
diff --git a/extras/Introjucer/Source/Wizards/jucer_NewFileWizard.h b/extras/Introjucer/Source/Wizards/jucer_NewFileWizard.h
index b70d52574d..c1d0d7166e 100644
--- a/extras/Introjucer/Source/Wizards/jucer_NewFileWizard.h
+++ b/extras/Introjucer/Source/Wizards/jucer_NewFileWizard.h
@@ -57,13 +57,13 @@ public:
     };
 
     //==============================================================================
-    void addWizardsToMenu (PopupMenu& m) const;
+    void addWizardsToMenu (PopupMenu&) const;
     bool runWizardFromMenu (int chosenMenuItemID, const Project::Item& projectGroupToAddTo) const;
 
-    void registerWizard (Type* newWizard);
+    void registerWizard (Type*);
 
 private:
-    OwnedArray <Type> wizards;
+    OwnedArray<Type> wizards;
 };
 
 
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Animated.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Animated.h
index c491bdae23..6a40c04af5 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Animated.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Animated.h
@@ -49,9 +49,8 @@ struct AnimatedAppWizard   : public NewProjectWizard
         String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile));
 
         // create main window
-
         String windowCpp = project.getFileTemplate ("jucer_AnimatedComponentTemplate_cpp")
-.replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false);
+                                .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false);
 
         if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompCpp, windowCpp))
             failedFiles.add (contentCompCpp.getFullPathName());
@@ -72,7 +71,6 @@ struct AnimatedAppWizard   : public NewProjectWizard
 
         sourceGroup.addFile (mainCppFile, -1, true);
 
-
         return true;
     }
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h
index 4ad95226c5..c0cc449e24 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h
@@ -49,9 +49,8 @@ struct AudioAppWizard   : public NewProjectWizard
         String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile));
 
         // create main window
-
         String windowCpp = project.getFileTemplate ("jucer_AudioComponentTemplate_cpp")
-.replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false);
+                            .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false);
 
         if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompCpp, windowCpp))
             failedFiles.add (contentCompCpp.getFullPathName());
@@ -72,7 +71,6 @@ struct AudioAppWizard   : public NewProjectWizard
 
         sourceGroup.addFile (mainCppFile, -1, true);
 
-
         return true;
     }