diff --git a/extras/Jucer (experimental)/Builds/Linux/Makefile b/extras/Introjucer/Builds/Linux/Makefile
similarity index 96%
rename from extras/Jucer (experimental)/Builds/Linux/Makefile
rename to extras/Introjucer/Builds/Linux/Makefile
index 54de5f27bb..e13ca865ca 100644
--- a/extras/Jucer (experimental)/Builds/Linux/Makefile	
+++ b/extras/Introjucer/Builds/Linux/Makefile
@@ -23,7 +23,7 @@ ifeq ($(CONFIG),Debug)
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../../../../juce/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound 
   LDDEPS :=
   RESFLAGS :=  -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
-  TARGET := Jucer
+  TARGET := Introjucer
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
@@ -38,7 +38,7 @@ ifeq ($(CONFIG),Release)
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../../../../juce/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound 
   LDDEPS :=
   RESFLAGS :=  -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
-  TARGET := Jucer
+  TARGET := Introjucer
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
@@ -74,14 +74,14 @@ OBJECTS := \
 .PHONY: clean
 
 $(OUTDIR)/$(TARGET): $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking The Jucer
+	@echo Linking The Introjucer
 	-@mkdir -p $(BINDIR)
 	-@mkdir -p $(LIBDIR)
 	-@mkdir -p $(OUTDIR)
 	@$(BLDCMD)
 
 clean:
-	@echo Cleaning The Jucer
+	@echo Cleaning The Introjucer
 	-@rm -f $(OUTDIR)/$(TARGET)
 	-@rm -rf $(OBJDIR)/*
 	-@rm -rf $(OBJDIR)
diff --git a/extras/Jucer (experimental)/Builds/MacOSX/Info.plist b/extras/Introjucer/Builds/MacOSX/Info.plist
similarity index 88%
rename from extras/Jucer (experimental)/Builds/MacOSX/Info.plist
rename to extras/Introjucer/Builds/MacOSX/Info.plist
index ca981917c4..d925a03388 100644
--- a/extras/Jucer (experimental)/Builds/MacOSX/Info.plist	
+++ b/extras/Introjucer/Builds/MacOSX/Info.plist
@@ -8,9 +8,9 @@
     <key>CFBundleIconFile</key>
     <string></string>
     <key>CFBundleIdentifier</key>
-    <string>com.rawmaterialsoftware.thejucer</string>
+    <string>com.rawmaterialsoftware.introjucer</string>
     <key>CFBundleName</key>
-    <string>The Jucer</string>
+    <string>The Introjucer</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleSignature</key>
diff --git a/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
similarity index 98%
rename from extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj
rename to extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index 0526b0516d..29bd67ce5d 100644
--- a/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj	
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
@@ -55,7 +55,7 @@
 		23CF69B4C644D1E6E61E5C82 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		2767E1D082874D301D5D5F43 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
 		D9FB1A5365FEEB854A0FF7BF = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
-		12E1601866B3489844AFD645 = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Jucer.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		12E1601866B3489844AFD645 = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Introjucer.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F4C5CF1AA7EB9298043D89D3 = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		2CB488FB81118B62A06AA82B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_Application.h; path = ../../Source/Application/jucer_Application.h; sourceTree = SOURCE_ROOT; };
 		6B373B89AA84EBE5964C7452 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_CommandIDs.h; path = ../../Source/Application/jucer_CommandIDs.h; sourceTree = SOURCE_ROOT; };
@@ -289,7 +289,7 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				ZERO_LINK = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf";
-				PRODUCT_NAME = "Jucer"; }; name = Debug; };
+				PRODUCT_NAME = "Introjucer"; }; name = Debug; };
 		4C681DED23FC5056A83C964C = { isa = XCBuildConfiguration; buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -304,7 +304,7 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				ZERO_LINK = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf";
-				PRODUCT_NAME = "Jucer"; }; name = Release; };
+				PRODUCT_NAME = "Introjucer"; }; name = Release; };
 		045AC698C60073CCF5CC6116 = { isa = XCConfigurationList; buildConfigurations = (
 				69D26A715A354ED1735D8438,
 				4C681DED23FC5056A83C964C ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; };
@@ -355,7 +355,7 @@
 		EB946A866C16B958168C9A39 = { isa = PBXNativeTarget; buildConfigurationList = AC9DE3D3A6632D0494CC8609; buildPhases = (
 				87CCE4CB1FAB40B6F21DEACE,
 				5362E03ADF975A126C1F2F7B,
-				08881173C882953BE5F11D6C ); buildRules = ( ); dependencies = ( ); name = "The Jucer"; productName = "The Jucer"; productReference = 12E1601866B3489844AFD645; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
+				08881173C882953BE5F11D6C ); buildRules = ( ); dependencies = ( ); name = "The Introjucer"; productName = "The Introjucer"; productReference = 12E1601866B3489844AFD645; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
 		D64DFDDF5D2CD74A8171CF81 = { isa = PBXProject; buildConfigurationList = 045AC698C60073CCF5CC6116; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = B01AA6CC1327A5DBCB35B7BF; projectDirPath = ""; projectRoot = ""; targets = ( EB946A866C16B958168C9A39 ); };
 	};
 	rootObject = D64DFDDF5D2CD74A8171CF81;
diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.sln b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.sln
similarity index 82%
rename from extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.sln
rename to extras/Introjucer/Builds/VisualStudio2005/The Introjucer.sln
index 3c2375329a..7bf226f0a1 100644
--- a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.sln	
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.sln	
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
 # Visual C++ Express 2005
-Project("{4E9D0CBA-BFAB-E5E4-0A60-A20FD97F37CA}") = "The Jucer", "The Jucer.vcproj", "{C9C4A72E-8CC9-D57E-C0D0-2E6109E48884}"
+Project("{4C35D249-2981-3D26-0C2E-BDE1841F8430}") = "The Introjucer", "The Introjucer.vcproj", "{C9C4A72E-8CC9-D57E-C0D0-2E6109E48884}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
similarity index 94%
rename from extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj
rename to extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index 4c768a4e60..7adc9e34c3 100644
--- a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
@@ -2,7 +2,7 @@
 
 <VisualStudioProject ProjectType="Visual C++"
                      Version="8.00"
-                     Name="The Jucer"
+                     Name="The Introjucer"
                      ProjectGUID="{C9C4A72E-8CC9-D57E-C0D0-2E6109E48884}"
                      TargetFrameworkVersion="131072">
   <Platforms>
@@ -26,7 +26,7 @@
             MkTypLibCompatible="true"
             SuppressStartupBanner="true"
             TargetEnvironment="1"
-            TypeLibraryName=".\Debug\Jucer.tlb"
+            TypeLibraryName=".\Debug\Introjucer.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
             Optimization="0"
@@ -37,7 +37,7 @@
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
             UsePrecompiledHeader="0"
-            PrecompiledHeaderFile=".\Debug\Jucer.pch"
+            PrecompiledHeaderFile=".\Debug\Introjucer.pch"
             AssemblerListingLocation=".\Debug\"
             ObjectFile=".\Debug\"
             ProgramDataBaseFileName=".\Debug\"
@@ -48,11 +48,11 @@
             PreprocessorDefinitions="_DEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
       <Tool Name="VCLinkerTool"
-            OutputFile=".\Debug\Jucer.exe"
+            OutputFile=".\Debug\Introjucer.exe"
             SuppressStartupBanner="true"
             IgnoreDefaultLibraryNames="libcmt.lib, msvcrt.lib"
             GenerateDebugInformation="true"
-            ProgramDatabaseFile=".\Debug\Jucer.pdb"
+            ProgramDatabaseFile=".\Debug\Introjucer.pdb"
             SubSystem="2"
             TargetMachine="1"/>
       <Tool Name="VCALinkTool"/>
@@ -60,7 +60,7 @@
       <Tool Name="VCXDCMakeTool"/>
       <Tool Name="VCBscMakeTool"
             SuppressStartupBanner="true"
-            OutputFile=".\Debug\Jucer.bsc"/>
+            OutputFile=".\Debug\Introjucer.bsc"/>
       <Tool Name="VCFxCopTool"/>
       <Tool Name="VCAppVerifierTool"/>
       <Tool Name="VCPostBuildEventTool"/>
@@ -82,7 +82,7 @@
             MkTypLibCompatible="true"
             SuppressStartupBanner="true"
             TargetEnvironment="1"
-            TypeLibraryName=".\Release\Jucer.tlb"
+            TypeLibraryName=".\Release\Introjucer.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
             Optimization="3"
@@ -93,7 +93,7 @@
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
             UsePrecompiledHeader="0"
-            PrecompiledHeaderFile=".\Release\Jucer.pch"
+            PrecompiledHeaderFile=".\Release\Introjucer.pch"
             AssemblerListingLocation=".\Release\"
             ObjectFile=".\Release\"
             ProgramDataBaseFileName=".\Release\"
@@ -104,11 +104,11 @@
             PreprocessorDefinitions="NDEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
       <Tool Name="VCLinkerTool"
-            OutputFile=".\Release\Jucer.exe"
+            OutputFile=".\Release\Introjucer.exe"
             SuppressStartupBanner="true"
             IgnoreDefaultLibraryNames=""
             GenerateDebugInformation="false"
-            ProgramDatabaseFile=".\Release\Jucer.pdb"
+            ProgramDatabaseFile=".\Release\Introjucer.pdb"
             SubSystem="2"
             GenerateManifest="false"
             OptimizeReferences="2"
@@ -119,7 +119,7 @@
       <Tool Name="VCXDCMakeTool"/>
       <Tool Name="VCBscMakeTool"
             SuppressStartupBanner="true"
-            OutputFile=".\Release\Jucer.bsc"/>
+            OutputFile=".\Release\Introjucer.bsc"/>
       <Tool Name="VCFxCopTool"/>
       <Tool Name="VCAppVerifierTool"/>
       <Tool Name="VCPostBuildEventTool"/>
@@ -127,7 +127,7 @@
   </Configurations>
   <References/>
   <Files>
-    <Filter Name="The Jucer">
+    <Filter Name="The Introjucer">
       <Filter Name="Application">
         <File RelativePath="..\..\Source\Application\jucer_Application.h"/>
         <File RelativePath="..\..\Source\Application\jucer_CommandIDs.h"/>
diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.sln b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.sln
similarity index 82%
rename from extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.sln
rename to extras/Introjucer/Builds/VisualStudio2008/The Introjucer.sln
index f5a31a8b61..f1c0a65930 100644
--- a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.sln	
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.sln	
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
-Project("{4E9D0CBA-BFAB-E5E4-0A60-A20FD97F37CA}") = "The Jucer", "The Jucer.vcproj", "{C9C4A72E-8CC9-D57E-C0D0-2E6109E48884}"
+Project("{4C35D249-2981-3D26-0C2E-BDE1841F8430}") = "The Introjucer", "The Introjucer.vcproj", "{C9C4A72E-8CC9-D57E-C0D0-2E6109E48884}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
similarity index 94%
rename from extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj
rename to extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
index 6c95751d08..9f66295670 100644
--- a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
@@ -2,7 +2,7 @@
 
 <VisualStudioProject ProjectType="Visual C++"
                      Version="9.00"
-                     Name="The Jucer"
+                     Name="The Introjucer"
                      ProjectGUID="{C9C4A72E-8CC9-D57E-C0D0-2E6109E48884}"
                      TargetFrameworkVersion="131072">
   <Platforms>
@@ -26,7 +26,7 @@
             MkTypLibCompatible="true"
             SuppressStartupBanner="true"
             TargetEnvironment="1"
-            TypeLibraryName=".\Debug\Jucer.tlb"
+            TypeLibraryName=".\Debug\Introjucer.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
             Optimization="0"
@@ -37,7 +37,7 @@
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
             UsePrecompiledHeader="0"
-            PrecompiledHeaderFile=".\Debug\Jucer.pch"
+            PrecompiledHeaderFile=".\Debug\Introjucer.pch"
             AssemblerListingLocation=".\Debug\"
             ObjectFile=".\Debug\"
             ProgramDataBaseFileName=".\Debug\"
@@ -48,11 +48,11 @@
             PreprocessorDefinitions="_DEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
       <Tool Name="VCLinkerTool"
-            OutputFile=".\Debug\Jucer.exe"
+            OutputFile=".\Debug\Introjucer.exe"
             SuppressStartupBanner="true"
             IgnoreDefaultLibraryNames="libcmt.lib, msvcrt.lib"
             GenerateDebugInformation="true"
-            ProgramDatabaseFile=".\Debug\Jucer.pdb"
+            ProgramDatabaseFile=".\Debug\Introjucer.pdb"
             SubSystem="2"
             TargetMachine="1"/>
       <Tool Name="VCALinkTool"/>
@@ -60,7 +60,7 @@
       <Tool Name="VCXDCMakeTool"/>
       <Tool Name="VCBscMakeTool"
             SuppressStartupBanner="true"
-            OutputFile=".\Debug\Jucer.bsc"/>
+            OutputFile=".\Debug\Introjucer.bsc"/>
       <Tool Name="VCFxCopTool"/>
       <Tool Name="VCAppVerifierTool"/>
       <Tool Name="VCPostBuildEventTool"/>
@@ -82,7 +82,7 @@
             MkTypLibCompatible="true"
             SuppressStartupBanner="true"
             TargetEnvironment="1"
-            TypeLibraryName=".\Release\Jucer.tlb"
+            TypeLibraryName=".\Release\Introjucer.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
             Optimization="3"
@@ -93,7 +93,7 @@
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
             UsePrecompiledHeader="0"
-            PrecompiledHeaderFile=".\Release\Jucer.pch"
+            PrecompiledHeaderFile=".\Release\Introjucer.pch"
             AssemblerListingLocation=".\Release\"
             ObjectFile=".\Release\"
             ProgramDataBaseFileName=".\Release\"
@@ -104,11 +104,11 @@
             PreprocessorDefinitions="NDEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
       <Tool Name="VCLinkerTool"
-            OutputFile=".\Release\Jucer.exe"
+            OutputFile=".\Release\Introjucer.exe"
             SuppressStartupBanner="true"
             IgnoreDefaultLibraryNames=""
             GenerateDebugInformation="false"
-            ProgramDatabaseFile=".\Release\Jucer.pdb"
+            ProgramDatabaseFile=".\Release\Introjucer.pdb"
             SubSystem="2"
             GenerateManifest="false"
             OptimizeReferences="2"
@@ -119,7 +119,7 @@
       <Tool Name="VCXDCMakeTool"/>
       <Tool Name="VCBscMakeTool"
             SuppressStartupBanner="true"
-            OutputFile=".\Release\Jucer.bsc"/>
+            OutputFile=".\Release\Introjucer.bsc"/>
       <Tool Name="VCFxCopTool"/>
       <Tool Name="VCAppVerifierTool"/>
       <Tool Name="VCPostBuildEventTool"/>
@@ -127,7 +127,7 @@
   </Configurations>
   <References/>
   <Files>
-    <Filter Name="The Jucer">
+    <Filter Name="The Introjucer">
       <Filter Name="Application">
         <File RelativePath="..\..\Source\Application\jucer_Application.h"/>
         <File RelativePath="..\..\Source\Application\jucer_CommandIDs.h"/>
diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.sln b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.sln
similarity index 82%
rename from extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.sln
rename to extras/Introjucer/Builds/VisualStudio2010/The Introjucer.sln
index c7f3fec7c1..2de9a54e10 100644
--- a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.sln	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.sln	
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
-Project("{4E9D0CBA-BFAB-E5E4-0A60-A20FD97F37CA}") = "The Jucer", "The Jucer.vcxproj", "{C9C4A72E-8CC9-D57E-C0D0-2E6109E48884}"
+Project("{4C35D249-2981-3D26-0C2E-BDE1841F8430}") = "The Introjucer", "The Introjucer.vcxproj", "{C9C4A72E-8CC9-D57E-C0D0-2E6109E48884}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
similarity index 94%
rename from extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj
rename to extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
index 9ca167f9a5..8ceb82aebe 100644
--- a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
@@ -37,10 +37,10 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Jucer</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Introjucer</TargetName>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Jucer</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Introjucer</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -68,17 +68,17 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\Debug\Jucer.exe</OutputFile>
+      <OutputFile>.\Debug\Introjucer.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>libcmt.lib; msvcrt.lib;;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Debug\Jucer.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\Debug\Introjucer.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug\Jucer.bsc</OutputFile>
+      <OutputFile>.\Debug\Introjucer.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -106,11 +106,11 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\Release\Jucer.exe</OutputFile>
+      <OutputFile>.\Release\Introjucer.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Release\Jucer.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\Release\Introjucer.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <OptimizeReferences>true</OptimizeReferences>
@@ -118,7 +118,7 @@
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release\Jucer.bsc</OutputFile>
+      <OutputFile>.\Release\Introjucer.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
similarity index 65%
rename from extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj.filters
rename to extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
index 19e09167bc..b7cd155aac 100644
--- a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
@@ -2,23 +2,23 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="The Jucer">
-      <UniqueIdentifier>{251378DC-2EBB-4B5D-54B9-F55AC57A478F}</UniqueIdentifier>
+    <Filter Include="The Introjucer">
+      <UniqueIdentifier>{ED748238-26CC-87E9-E280-F46B6D62B64F}</UniqueIdentifier>
     </Filter>
-    <Filter Include="The Jucer\Application">
-      <UniqueIdentifier>{31EDBA88-31A5-997C-9F07-EE6B43F914D0}</UniqueIdentifier>
+    <Filter Include="The Introjucer\Application">
+      <UniqueIdentifier>{5AFE9176-C481-3BD6-B1A2-E344873B906D}</UniqueIdentifier>
     </Filter>
-    <Filter Include="The Jucer\Code Editor">
-      <UniqueIdentifier>{F41CE18D-09FC-818B-809B-287ED61EC70C}</UniqueIdentifier>
+    <Filter Include="The Introjucer\Code Editor">
+      <UniqueIdentifier>{7D1B95A0-4E50-DD4E-402D-840BD601DCF8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="The Jucer\Project">
-      <UniqueIdentifier>{0F8BE833-CD54-C01F-F820-48DFE266AE32}</UniqueIdentifier>
+    <Filter Include="The Introjucer\Project">
+      <UniqueIdentifier>{B5B5C922-2604-DF83-A0B9-259C3DBA1AF6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="The Jucer\Utility">
-      <UniqueIdentifier>{E870C076-EBCA-BE3D-D4EB-5D91F2FF6C9F}</UniqueIdentifier>
+    <Filter Include="The Introjucer\Utility">
+      <UniqueIdentifier>{647FC3C6-4A06-A9FA-2C82-8F8744A223EE}</UniqueIdentifier>
     </Filter>
-    <Filter Include="The Jucer\BinaryData">
-      <UniqueIdentifier>{FC97072F-FF15-52B0-B523-A4C3265DA556}</UniqueIdentifier>
+    <Filter Include="The Introjucer\BinaryData">
+      <UniqueIdentifier>{8CE77BC0-4FCD-C9EA-C5D2-4E2ED36FDAAD}</UniqueIdentifier>
     </Filter>
     <Filter Include="Juce Library Code">
       <UniqueIdentifier>{F7048EA6-F4B2-F31B-E402-E05D678A1111}</UniqueIdentifier>
@@ -26,97 +26,97 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Application\jucer_DocumentEditorComponent.cpp">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Application\jucer_FilePreviewComponent.cpp">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Application\jucer_JuceUpdater.cpp">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Application\jucer_Main.cpp">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Application\jucer_OpenDocumentManager.cpp">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.cpp">
-      <Filter>The Jucer\Code Editor</Filter>
+      <Filter>The Introjucer\Code Editor</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_GroupInformationComponent.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_NewFileWizard.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_NewProjectWizard.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_Project.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_ProjectContentComponent.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_ProjectExporter.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_ProjectInformationComponent.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_ProjectTreeViewBase.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_ResourceFile.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Project\jucer_TreeViewTypes.cpp">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Utility\jucer_CodeHelpers.cpp">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Utility\jucer_FileHelpers.cpp">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Utility\jucer_JucerTreeViewBase.cpp">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Utility\jucer_MiscUtilities.cpp">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Utility\jucer_StoredSettings.cpp">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\AudioPluginXCodeScript.txt">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\brushed_aluminium.png">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate.cpp">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\jucer_WindowTemplate.cpp">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\BinaryData\juce_icon.png">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
     <ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
       <Filter>Juce Library Code</Filter>
@@ -136,118 +136,118 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Application\jucer_Application.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Application\jucer_CommandIDs.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Application\jucer_CommonHeaders.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Application\jucer_DocumentEditorComponent.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Application\jucer_FilePreviewComponent.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\jucer_Headers.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Application\jucer_JuceUpdater.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Application\jucer_MainWindow.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Application\jucer_OpenDocumentManager.h">
-      <Filter>The Jucer\Application</Filter>
+      <Filter>The Introjucer\Application</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.h">
-      <Filter>The Jucer\Code Editor</Filter>
+      <Filter>The Introjucer\Code Editor</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_GroupInformationComponent.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_NewFileWizard.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_NewProjectWizard.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_Project.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectContentComponent.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectExporter.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectExport_Android.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectExport_Make.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectExport_MSVC.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectExport_XCode.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectInformationComponent.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectSaver.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectTreeViewBase.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_ResourceFile.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_TreeViewTypes.h">
-      <Filter>The Jucer\Project</Filter>
+      <Filter>The Introjucer\Project</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_Colours.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_FileHelpers.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_JucerTreeViewBase.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_MiscUtilities.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_PresetIDs.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_RelativePath.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_StoredSettings.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_ValueSourceHelpers.h">
-      <Filter>The Jucer\Utility</Filter>
+      <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\BinaryData\jucer_WindowTemplate.h">
-      <Filter>The Jucer\BinaryData</Filter>
+      <Filter>The Introjucer\BinaryData</Filter>
     </ClInclude>
     <ClInclude Include="..\..\JuceLibraryCode\AppConfig.h">
       <Filter>Juce Library Code</Filter>
diff --git a/extras/Jucer (experimental)/Jucer.jucer b/extras/Introjucer/Introjucer.jucer
similarity index 92%
rename from extras/Jucer (experimental)/Jucer.jucer
rename to extras/Introjucer/Introjucer.jucer
index 588b158e16..968d85458f 100644
--- a/extras/Jucer (experimental)/Jucer.jucer	
+++ b/extras/Introjucer/Introjucer.jucer
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="M70qfTRRk" name="The Jucer" projectType="guiapp" juceLinkage="amalg_multi"
+<JUCERPROJECT id="M70qfTRRk" name="The Introjucer" projectType="guiapp" juceLinkage="amalg_multi"
               juceFolder="../../juce" jucerVersion="3.0.0" version="3.0.0"
               buildVST="1" buildRTAS="0" buildAU="1" vstFolderMac="~/SDKs/vstsdk2.4"
               vstFolderPC="c:\SDKs\vstsdk2.4" rtasFolderMac="~/SDKs/PT_80_SDK"
-              rtasFolderPC="c:\SDKs\PT_80_SDK" pluginName="The Jucer" pluginDesc="The Jucer"
-              pluginManufacturer="yourcompany" pluginManufacturerCode="abcd"
-              pluginCode="Abcd" pluginChannelConfigs="{ {1, 1}, {2, 2} }" pluginIsSynth="0"
-              pluginWantsMidiIn="0" pluginProducesMidiOut="0" pluginSilenceInIsSilenceOut="0"
-              pluginTailLength="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="TheJucerAU"
-              pluginAUViewClass="TheJucerAU_V1" pluginRTASCategory="" bundleIdentifier="com.rawmaterialsoftware.thejucer">
+              rtasFolderPC="c:\SDKs\PT_80_SDK" pluginName="The Introjucer"
+              pluginDesc="The Introjucer" pluginManufacturer="yourcompany"
+              pluginManufacturerCode="abcd" pluginCode="Abcd" pluginChannelConfigs="{ {1, 1}, {2, 2} }"
+              pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0"
+              pluginSilenceInIsSilenceOut="0" pluginTailLength="0" pluginEditorRequiresKeys="0"
+              pluginAUExportPrefix="TheIntrojucerAU" pluginAUViewClass="TheIntrojucerAU_V1"
+              pluginRTASCategory="" bundleIdentifier="com.rawmaterialsoftware.introjucer">
   <EXPORTFORMATS>
     <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
                juceFolder="../.." documentExtensions=".jucer" objCExtraSuffix="zNNCr"/>
@@ -22,12 +23,12 @@
             rtasFolder="c:\SDKs\PT_80_SDK" libraryType="1" juceFolder="../.."/>
   </EXPORTFORMATS>
   <CONFIGURATIONS>
-    <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="Jucer"
+    <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="Introjucer"
                    osxSDK="1" osxCompatibility="1"/>
-    <CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="Jucer"
+    <CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="Introjucer"
                    osxSDK="1" osxCompatibility="1"/>
   </CONFIGURATIONS>
-  <MAINGROUP name="The Jucer" id="NhrJq66R">
+  <MAINGROUP name="The Introjucer" id="NhrJq66R">
     <GROUP id="mslFIKZ" name="Application">
       <FILE id="PXX8Yi" name="jucer_Application.h" compile="0" resource="0"
             file="Source/Application/jucer_Application.h"/>
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/AppConfig.h b/extras/Introjucer/JuceLibraryCode/AppConfig.h
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/AppConfig.h
rename to extras/Introjucer/JuceLibraryCode/AppConfig.h
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.cpp b/extras/Introjucer/JuceLibraryCode/BinaryData.cpp
similarity index 98%
rename from extras/Jucer (experimental)/JuceLibraryCode/BinaryData.cpp
rename to extras/Introjucer/JuceLibraryCode/BinaryData.cpp
index ffd2e5a611..750ec04894 100644
--- a/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.cpp	
+++ b/extras/Introjucer/JuceLibraryCode/BinaryData.cpp
@@ -39,7 +39,7 @@ const char* BinaryData::getNamedResource (const char* resourceNameUTF8, int& num
 
 
 //================== AudioPluginXCodeScript.txt ==================
-static const unsigned char temp_5985dfa5[] =
+static const unsigned char temp_43731c40[] =
 "\r\n"
 "# This script takes the build product and copies it to the AU, VST, and RTAS folders, depending on \r\n"
 "# which plugin types you've built\r\n"
@@ -85,10 +85,10 @@ static const unsigned char temp_5985dfa5[] =
 "  cp -r \"$original\" \"$RTAS\"\r\n"
 "fi\r\n";
 
-const char* BinaryData::AudioPluginXCodeScript_txt = (const char*) temp_5985dfa5;
+const char* BinaryData::AudioPluginXCodeScript_txt = (const char*) temp_43731c40;
 
 //================== brushed_aluminium.png ==================
-static const unsigned char temp_31c089f2[] =
+static const unsigned char temp_9aa09877[] =
 { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,1,84,0,0,0,110,8,2,0,0,0,247,102,124,157,0,0,0,9,112,72,89,115,0,0,11,19,0,0,11,19,1,0,154,156,24,0,0,0,4,103,65,77,65,0,0,177,142,124,251,81,147,0,0,0,32,99,72,82,77,0,0,122,37,0,0,128,131,0,0,249,255,
 0,0,128,233,0,0,117,48,0,0,234,96,0,0,58,152,0,0,23,111,146,95,197,70,0,0,56,250,73,68,65,84,120,218,172,83,71,14,192,32,12,75,248,255,153,231,66,17,81,45,203,97,244,80,31,16,114,246,242,90,171,153,185,187,189,224,127,239,221,8,33,10,178,79,240,135,245,
 197,48,152,48,247,137,80,64,44,72,51,66,196,230,87,125,206,22,177,6,74,41,98,216,90,147,4,144,24,107,242,7,10,97,203,140,148,47,53,230,90,196,231,1,185,88,97,174,221,56,48,255,226,139,127,214,217,181,98,12,75,218,190,172,37,147,60,71,225,151,185,241,
@@ -297,10 +297,10 @@ static const unsigned char temp_31c089f2[] =
 141,20,180,27,72,224,103,149,105,220,112,255,4,89,131,64,4,23,42,115,215,231,245,156,43,234,151,42,11,138,116,121,82,135,79,3,255,178,101,152,75,177,57,53,232,244,11,46,246,251,67,98,174,121,193,110,222,30,8,28,132,216,112,88,219,73,10,62,169,115,60,
 233,137,16,177,58,98,69,178,95,87,93,157,5,174,93,143,182,244,186,210,167,70,131,11,5,88,2,12,0,52,103,80,26,178,200,170,15,0,0,0,0,73,69,78,68,174,66,96,130,0,0 };
 
-const char* BinaryData::brushed_aluminium_png = (const char*) temp_31c089f2;
+const char* BinaryData::brushed_aluminium_png = (const char*) temp_9aa09877;
 
 //================== jucer_AudioPluginEditorTemplate.cpp ==================
-static const unsigned char temp_5f2c944f[] =
+static const unsigned char temp_6eda5614[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -337,10 +337,10 @@ static const unsigned char temp_5f2c944f[] =
 "                      Justification::centred, 1);\r\n"
 "}\r\n";
 
-const char* BinaryData::jucer_AudioPluginEditorTemplate_cpp = (const char*) temp_5f2c944f;
+const char* BinaryData::jucer_AudioPluginEditorTemplate_cpp = (const char*) temp_6eda5614;
 
 //================== jucer_AudioPluginEditorTemplate.h ==================
-static const unsigned char temp_39e7ce14[] =
+static const unsigned char temp_67353d19[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -374,10 +374,10 @@ static const unsigned char temp_39e7ce14[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* BinaryData::jucer_AudioPluginEditorTemplate_h = (const char*) temp_39e7ce14;
+const char* BinaryData::jucer_AudioPluginEditorTemplate_h = (const char*) temp_67353d19;
 
 //================== jucer_AudioPluginFilterTemplate.cpp ==================
-static const unsigned char temp_891b85da[] =
+static const unsigned char temp_98c9479f[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -556,10 +556,10 @@ static const unsigned char temp_891b85da[] =
 "    return new FILTERCLASSNAME();\r\n"
 "}\r\n";
 
-const char* BinaryData::jucer_AudioPluginFilterTemplate_cpp = (const char*) temp_891b85da;
+const char* BinaryData::jucer_AudioPluginFilterTemplate_cpp = (const char*) temp_98c9479f;
 
 //================== jucer_AudioPluginFilterTemplate.h ==================
-static const unsigned char temp_356ba65f[] =
+static const unsigned char temp_62b91564[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -633,10 +633,10 @@ static const unsigned char temp_356ba65f[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* BinaryData::jucer_AudioPluginFilterTemplate_h = (const char*) temp_356ba65f;
+const char* BinaryData::jucer_AudioPluginFilterTemplate_h = (const char*) temp_62b91564;
 
 //================== jucer_MainConsoleAppTemplate.cpp ==================
-static const unsigned char temp_77cce868[] =
+static const unsigned char temp_794304c3[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -665,10 +665,10 @@ static const unsigned char temp_77cce868[] =
 "    return 0;\r\n"
 "}\r\n";
 
-const char* BinaryData::jucer_MainConsoleAppTemplate_cpp = (const char*) temp_77cce868;
+const char* BinaryData::jucer_MainConsoleAppTemplate_cpp = (const char*) temp_794304c3;
 
 //================== jucer_MainTemplate.cpp ==================
-static const unsigned char temp_760350be[] =
+static const unsigned char temp_292512d9[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -743,10 +743,10 @@ static const unsigned char temp_760350be[] =
 "// This macro generates the main() routine that starts the app.\r\n"
 "START_JUCE_APPLICATION(APPCLASSNAME)\r\n";
 
-const char* BinaryData::jucer_MainTemplate_cpp = (const char*) temp_760350be;
+const char* BinaryData::jucer_MainTemplate_cpp = (const char*) temp_292512d9;
 
 //================== jucer_NewCppFileTemplate.cpp ==================
-static const unsigned char temp_564e4d84[] =
+static const unsigned char temp_79decf5f[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -758,10 +758,10 @@ static const unsigned char temp_564e4d84[] =
 "*/\r\n"
 "\r\n";
 
-const char* BinaryData::jucer_NewCppFileTemplate_cpp = (const char*) temp_564e4d84;
+const char* BinaryData::jucer_NewCppFileTemplate_cpp = (const char*) temp_79decf5f;
 
 //================== jucer_NewCppFileTemplate.h ==================
-static const unsigned char temp_1d205089[] =
+static const unsigned char temp_70d8d24[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -781,10 +781,10 @@ static const unsigned char temp_1d205089[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* BinaryData::jucer_NewCppFileTemplate_h = (const char*) temp_1d205089;
+const char* BinaryData::jucer_NewCppFileTemplate_h = (const char*) temp_70d8d24;
 
 //================== jucer_WindowTemplate.cpp ==================
-static const unsigned char temp_9543d6f5[] =
+static const unsigned char temp_6fd7e50[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -817,10 +817,10 @@ static const unsigned char temp_9543d6f5[] =
 "    JUCEApplication::getInstance()->systemRequestedQuit();\r\n"
 "}\r\n";
 
-const char* BinaryData::jucer_WindowTemplate_cpp = (const char*) temp_9543d6f5;
+const char* BinaryData::jucer_WindowTemplate_cpp = (const char*) temp_6fd7e50;
 
 //================== jucer_WindowTemplate.h ==================
-static const unsigned char temp_ae1b823a[] =
+static const unsigned char temp_613d4455[] =
 "/*\r\n"
 "  ==============================================================================\r\n"
 "\r\n"
@@ -863,10 +863,10 @@ static const unsigned char temp_ae1b823a[] =
 "\r\n"
 "#endif  // HEADERGUARD\r\n";
 
-const char* BinaryData::jucer_WindowTemplate_h = (const char*) temp_ae1b823a;
+const char* BinaryData::jucer_WindowTemplate_h = (const char*) temp_613d4455;
 
 //================== juce_icon.png ==================
-static const unsigned char temp_cf09a88a[] =
+static const unsigned char temp_ee6f0c0f[] =
 { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,128,0,0,0,128,8,6,0,0,0,195,62,97,203,0,0,0,9,112,72,89,115,0,0,11,19,0,0,11,19,1,0,154,156,24,0,0,0,4,103,65,77,65,0,0,177,142,124,251,81,147,0,0,0,32,99,72,82,77,0,0,122,37,0,0,128,131,0,0,249,255,
 0,0,128,233,0,0,117,48,0,0,234,96,0,0,58,152,0,0,23,111,146,95,197,70,0,0,76,232,73,68,65,84,120,218,98,252,255,255,63,3,35,35,35,195,16,4,140,88,216,76,72,124,70,36,113,70,52,113,108,102,192,192,127,52,246,127,52,241,255,104,226,255,112,232,27,18,0,
 32,128,88,134,120,164,35,99,38,44,52,54,117,216,18,2,182,68,128,45,194,209,241,63,52,250,63,150,200,31,212,137,1,32,128,88,134,88,196,163,71,56,19,82,132,51,99,17,99,194,146,0,112,149,12,248,114,58,174,72,135,225,191,88,196,254,15,133,82,1,32,128,88,
@@ -1144,4 +1144,4 @@ static const unsigned char temp_cf09a88a[] =
 169,9,0,87,15,129,129,1,247,197,140,255,7,123,160,2,4,208,80,74,0,184,18,2,250,200,222,95,34,70,253,24,73,176,3,215,216,5,190,132,57,100,0,64,0,13,197,4,64,76,201,64,40,146,73,77,0,164,202,15,25,0,16,96,0,155,121,235,71,10,157,3,42,0,0,0,0,73,69,78,68,
 174,66,96,130,0,0 };
 
-const char* BinaryData::juce_icon_png = (const char*) temp_cf09a88a;
+const char* BinaryData::juce_icon_png = (const char*) temp_ee6f0c0f;
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.h b/extras/Introjucer/JuceLibraryCode/BinaryData.h
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/BinaryData.h
rename to extras/Introjucer/JuceLibraryCode/BinaryData.h
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceHeader.h b/extras/Introjucer/JuceLibraryCode/JuceHeader.h
similarity index 77%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceHeader.h
rename to extras/Introjucer/JuceLibraryCode/JuceHeader.h
index 1af13f0b74..a4994ad361 100644
--- a/extras/Jucer (experimental)/JuceLibraryCode/JuceHeader.h	
+++ b/extras/Introjucer/JuceLibraryCode/JuceHeader.h
@@ -10,8 +10,8 @@
 
 */
 
-#ifndef __APPHEADERFILE_347B64F4__
-#define __APPHEADERFILE_347B64F4__
+#ifndef __APPHEADERFILE_BD73378F__
+#define __APPHEADERFILE_BD73378F__
 
 #include "AppConfig.h"
 #include "../../../juce_amalgamated.h"
@@ -19,9 +19,9 @@
 
 namespace ProjectInfo
 {
-    const char* const  projectName    = "The Jucer";
+    const char* const  projectName    = "The Introjucer";
     const char* const  versionString  = "3.0.0";
     const int          versionNumber  = 0x30000;
 }
 
-#endif   // __APPHEADERFILE_347B64F4__
+#endif   // __APPHEADERFILE_BD73378F__
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode1.cpp b/extras/Introjucer/JuceLibraryCode/JuceLibraryCode1.cpp
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode1.cpp
rename to extras/Introjucer/JuceLibraryCode/JuceLibraryCode1.cpp
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode1.mm b/extras/Introjucer/JuceLibraryCode/JuceLibraryCode1.mm
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode1.mm
rename to extras/Introjucer/JuceLibraryCode/JuceLibraryCode1.mm
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode2.cpp b/extras/Introjucer/JuceLibraryCode/JuceLibraryCode2.cpp
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode2.cpp
rename to extras/Introjucer/JuceLibraryCode/JuceLibraryCode2.cpp
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode2.mm b/extras/Introjucer/JuceLibraryCode/JuceLibraryCode2.mm
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode2.mm
rename to extras/Introjucer/JuceLibraryCode/JuceLibraryCode2.mm
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode3.cpp b/extras/Introjucer/JuceLibraryCode/JuceLibraryCode3.cpp
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode3.cpp
rename to extras/Introjucer/JuceLibraryCode/JuceLibraryCode3.cpp
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode3.mm b/extras/Introjucer/JuceLibraryCode/JuceLibraryCode3.mm
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode3.mm
rename to extras/Introjucer/JuceLibraryCode/JuceLibraryCode3.mm
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode4.cpp b/extras/Introjucer/JuceLibraryCode/JuceLibraryCode4.cpp
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode4.cpp
rename to extras/Introjucer/JuceLibraryCode/JuceLibraryCode4.cpp
diff --git a/extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode4.mm b/extras/Introjucer/JuceLibraryCode/JuceLibraryCode4.mm
similarity index 100%
rename from extras/Jucer (experimental)/JuceLibraryCode/JuceLibraryCode4.mm
rename to extras/Introjucer/JuceLibraryCode/JuceLibraryCode4.mm
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_Application.h b/extras/Introjucer/Source/Application/jucer_Application.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_Application.h
rename to extras/Introjucer/Source/Application/jucer_Application.h
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_CommandIDs.h b/extras/Introjucer/Source/Application/jucer_CommandIDs.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_CommandIDs.h
rename to extras/Introjucer/Source/Application/jucer_CommandIDs.h
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_CommonHeaders.h b/extras/Introjucer/Source/Application/jucer_CommonHeaders.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_CommonHeaders.h
rename to extras/Introjucer/Source/Application/jucer_CommonHeaders.h
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_DocumentEditorComponent.cpp b/extras/Introjucer/Source/Application/jucer_DocumentEditorComponent.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_DocumentEditorComponent.cpp
rename to extras/Introjucer/Source/Application/jucer_DocumentEditorComponent.cpp
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_DocumentEditorComponent.h b/extras/Introjucer/Source/Application/jucer_DocumentEditorComponent.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_DocumentEditorComponent.h
rename to extras/Introjucer/Source/Application/jucer_DocumentEditorComponent.h
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_FilePreviewComponent.cpp b/extras/Introjucer/Source/Application/jucer_FilePreviewComponent.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_FilePreviewComponent.cpp
rename to extras/Introjucer/Source/Application/jucer_FilePreviewComponent.cpp
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_FilePreviewComponent.h b/extras/Introjucer/Source/Application/jucer_FilePreviewComponent.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_FilePreviewComponent.h
rename to extras/Introjucer/Source/Application/jucer_FilePreviewComponent.h
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.cpp b/extras/Introjucer/Source/Application/jucer_JuceUpdater.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.cpp
rename to extras/Introjucer/Source/Application/jucer_JuceUpdater.cpp
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.h b/extras/Introjucer/Source/Application/jucer_JuceUpdater.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.h
rename to extras/Introjucer/Source/Application/jucer_JuceUpdater.h
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_Main.cpp b/extras/Introjucer/Source/Application/jucer_Main.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_Main.cpp
rename to extras/Introjucer/Source/Application/jucer_Main.cpp
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_MainWindow.cpp b/extras/Introjucer/Source/Application/jucer_MainWindow.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_MainWindow.cpp
rename to extras/Introjucer/Source/Application/jucer_MainWindow.cpp
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_MainWindow.h b/extras/Introjucer/Source/Application/jucer_MainWindow.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_MainWindow.h
rename to extras/Introjucer/Source/Application/jucer_MainWindow.h
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_OpenDocumentManager.cpp b/extras/Introjucer/Source/Application/jucer_OpenDocumentManager.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_OpenDocumentManager.cpp
rename to extras/Introjucer/Source/Application/jucer_OpenDocumentManager.cpp
diff --git a/extras/Jucer (experimental)/Source/Application/jucer_OpenDocumentManager.h b/extras/Introjucer/Source/Application/jucer_OpenDocumentManager.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Application/jucer_OpenDocumentManager.h
rename to extras/Introjucer/Source/Application/jucer_OpenDocumentManager.h
diff --git a/extras/Jucer (experimental)/Source/BinaryData/AudioPluginXCodeScript.txt b/extras/Introjucer/Source/BinaryData/AudioPluginXCodeScript.txt
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/AudioPluginXCodeScript.txt
rename to extras/Introjucer/Source/BinaryData/AudioPluginXCodeScript.txt
diff --git a/extras/Jucer (experimental)/Source/BinaryData/brushed_aluminium.png b/extras/Introjucer/Source/BinaryData/brushed_aluminium.png
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/brushed_aluminium.png
rename to extras/Introjucer/Source/BinaryData/brushed_aluminium.png
diff --git a/extras/Jucer (experimental)/Source/BinaryData/juce_icon.png b/extras/Introjucer/Source/BinaryData/juce_icon.png
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/juce_icon.png
rename to extras/Introjucer/Source/BinaryData/juce_icon.png
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_AudioPluginEditorTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_AudioPluginEditorTemplate.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_AudioPluginEditorTemplate.cpp
rename to extras/Introjucer/Source/BinaryData/jucer_AudioPluginEditorTemplate.cpp
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_AudioPluginEditorTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_AudioPluginEditorTemplate.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_AudioPluginEditorTemplate.h
rename to extras/Introjucer/Source/BinaryData/jucer_AudioPluginEditorTemplate.h
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp
rename to extras/Introjucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_AudioPluginFilterTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_AudioPluginFilterTemplate.h
rename to extras/Introjucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_MainConsoleAppTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_MainConsoleAppTemplate.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_MainConsoleAppTemplate.cpp
rename to extras/Introjucer/Source/BinaryData/jucer_MainConsoleAppTemplate.cpp
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_MainTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_MainTemplate.cpp
rename to extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_NewCppFileTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_NewCppFileTemplate.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_NewCppFileTemplate.cpp
rename to extras/Introjucer/Source/BinaryData/jucer_NewCppFileTemplate.cpp
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_NewCppFileTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_NewCppFileTemplate.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_NewCppFileTemplate.h
rename to extras/Introjucer/Source/BinaryData/jucer_NewCppFileTemplate.h
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_WindowTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_WindowTemplate.cpp
rename to extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp
diff --git a/extras/Jucer (experimental)/Source/BinaryData/jucer_WindowTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/BinaryData/jucer_WindowTemplate.h
rename to extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h
diff --git a/extras/Jucer (experimental)/Source/Code Editor/jucer_SourceCodeEditor.cpp b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Code Editor/jucer_SourceCodeEditor.cpp
rename to extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp
diff --git a/extras/Jucer (experimental)/Source/Code Editor/jucer_SourceCodeEditor.h b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Code Editor/jucer_SourceCodeEditor.h
rename to extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_GroupInformationComponent.cpp b/extras/Introjucer/Source/Project/jucer_GroupInformationComponent.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_GroupInformationComponent.cpp
rename to extras/Introjucer/Source/Project/jucer_GroupInformationComponent.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_GroupInformationComponent.h b/extras/Introjucer/Source/Project/jucer_GroupInformationComponent.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_GroupInformationComponent.h
rename to extras/Introjucer/Source/Project/jucer_GroupInformationComponent.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_NewFileWizard.cpp b/extras/Introjucer/Source/Project/jucer_NewFileWizard.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_NewFileWizard.cpp
rename to extras/Introjucer/Source/Project/jucer_NewFileWizard.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_NewFileWizard.h b/extras/Introjucer/Source/Project/jucer_NewFileWizard.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_NewFileWizard.h
rename to extras/Introjucer/Source/Project/jucer_NewFileWizard.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_NewProjectWizard.cpp b/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_NewProjectWizard.cpp
rename to extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_NewProjectWizard.h b/extras/Introjucer/Source/Project/jucer_NewProjectWizard.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_NewProjectWizard.h
rename to extras/Introjucer/Source/Project/jucer_NewProjectWizard.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_Project.cpp b/extras/Introjucer/Source/Project/jucer_Project.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_Project.cpp
rename to extras/Introjucer/Source/Project/jucer_Project.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_Project.h b/extras/Introjucer/Source/Project/jucer_Project.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_Project.h
rename to extras/Introjucer/Source/Project/jucer_Project.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectContentComponent.cpp b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectContentComponent.cpp
rename to extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectContentComponent.h b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectContentComponent.h
rename to extras/Introjucer/Source/Project/jucer_ProjectContentComponent.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Android.h b/extras/Introjucer/Source/Project/jucer_ProjectExport_Android.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Android.h
rename to extras/Introjucer/Source/Project/jucer_ProjectExport_Android.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_MSVC.h b/extras/Introjucer/Source/Project/jucer_ProjectExport_MSVC.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_MSVC.h
rename to extras/Introjucer/Source/Project/jucer_ProjectExport_MSVC.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Make.h b/extras/Introjucer/Source/Project/jucer_ProjectExport_Make.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Make.h
rename to extras/Introjucer/Source/Project/jucer_ProjectExport_Make.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project/jucer_ProjectExport_XCode.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_XCode.h
rename to extras/Introjucer/Source/Project/jucer_ProjectExport_XCode.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.cpp b/extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp
similarity index 97%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.cpp
rename to extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp
index ec07044633..25877fb8dd 100644
--- a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.cpp	
+++ b/extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp
@@ -56,7 +56,7 @@ const StringArray ProjectExporter::getExporterNames()
     s.add (MSVCProjectExporterVC2008::getName());
     s.add (MSVCProjectExporterVC2010::getName());
     s.add (MakefileProjectExporter::getNameLinux());
-    //s.add (AndroidProjectExporter::getNameAndroid());
+    s.add (AndroidProjectExporter::getNameAndroid());
     return s;
 }
 
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.h b/extras/Introjucer/Source/Project/jucer_ProjectExporter.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.h
rename to extras/Introjucer/Source/Project/jucer_ProjectExporter.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectInformationComponent.cpp b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectInformationComponent.cpp
rename to extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectInformationComponent.h b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectInformationComponent.h
rename to extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectSaver.h b/extras/Introjucer/Source/Project/jucer_ProjectSaver.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectSaver.h
rename to extras/Introjucer/Source/Project/jucer_ProjectSaver.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectTreeViewBase.cpp b/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectTreeViewBase.cpp
rename to extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectTreeViewBase.h b/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ProjectTreeViewBase.h
rename to extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ResourceFile.cpp b/extras/Introjucer/Source/Project/jucer_ResourceFile.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ResourceFile.cpp
rename to extras/Introjucer/Source/Project/jucer_ResourceFile.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ResourceFile.h b/extras/Introjucer/Source/Project/jucer_ResourceFile.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_ResourceFile.h
rename to extras/Introjucer/Source/Project/jucer_ResourceFile.h
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_TreeViewTypes.cpp b/extras/Introjucer/Source/Project/jucer_TreeViewTypes.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_TreeViewTypes.cpp
rename to extras/Introjucer/Source/Project/jucer_TreeViewTypes.cpp
diff --git a/extras/Jucer (experimental)/Source/Project/jucer_TreeViewTypes.h b/extras/Introjucer/Source/Project/jucer_TreeViewTypes.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Project/jucer_TreeViewTypes.h
rename to extras/Introjucer/Source/Project/jucer_TreeViewTypes.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_CodeHelpers.cpp b/extras/Introjucer/Source/Utility/jucer_CodeHelpers.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_CodeHelpers.cpp
rename to extras/Introjucer/Source/Utility/jucer_CodeHelpers.cpp
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_CodeHelpers.h b/extras/Introjucer/Source/Utility/jucer_CodeHelpers.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_CodeHelpers.h
rename to extras/Introjucer/Source/Utility/jucer_CodeHelpers.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_Colours.h b/extras/Introjucer/Source/Utility/jucer_Colours.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_Colours.h
rename to extras/Introjucer/Source/Utility/jucer_Colours.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_FileHelpers.cpp b/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_FileHelpers.cpp
rename to extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_FileHelpers.h b/extras/Introjucer/Source/Utility/jucer_FileHelpers.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_FileHelpers.h
rename to extras/Introjucer/Source/Utility/jucer_FileHelpers.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_JucerTreeViewBase.cpp b/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_JucerTreeViewBase.cpp
rename to extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.cpp
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_JucerTreeViewBase.h b/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_JucerTreeViewBase.h
rename to extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.cpp b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.cpp
rename to extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.h b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.h
rename to extras/Introjucer/Source/Utility/jucer_MiscUtilities.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_PresetIDs.h b/extras/Introjucer/Source/Utility/jucer_PresetIDs.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_PresetIDs.h
rename to extras/Introjucer/Source/Utility/jucer_PresetIDs.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_RelativePath.h b/extras/Introjucer/Source/Utility/jucer_RelativePath.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_RelativePath.h
rename to extras/Introjucer/Source/Utility/jucer_RelativePath.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_StoredSettings.cpp b/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_StoredSettings.cpp
rename to extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_StoredSettings.h b/extras/Introjucer/Source/Utility/jucer_StoredSettings.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_StoredSettings.h
rename to extras/Introjucer/Source/Utility/jucer_StoredSettings.h
diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_ValueSourceHelpers.h b/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/Utility/jucer_ValueSourceHelpers.h
rename to extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h
diff --git a/extras/Jucer (experimental)/Source/jucer_Headers.h b/extras/Introjucer/Source/jucer_Headers.h
similarity index 100%
rename from extras/Jucer (experimental)/Source/jucer_Headers.h
rename to extras/Introjucer/Source/jucer_Headers.h
diff --git a/extras/JuceDemo/Juce Demo.jucer b/extras/JuceDemo/Juce Demo.jucer
index e020acf129..3551b43418 100644
--- a/extras/JuceDemo/Juce Demo.jucer	
+++ b/extras/JuceDemo/Juce Demo.jucer	
@@ -21,6 +21,9 @@
     <LINUX_MAKE targetFolder="Builds/Linux" vstFolder="~/SDKs/vstsdk2.4" juceFolder="../../../juce"/>
     <VS2010 targetFolder="Builds/VisualStudio2010" vstFolder="c:\SDKs\vstsdk2.4"
             rtasFolder="c:\SDKs\PT_80_SDK" libraryType="1" juceFolder="../../../juce"/>
+    <ANDROID targetFolder="Builds/Android" androidSDKPath="${user.home}/SDKs/android-sdk-mac_86"
+             androidNDKPath="${user.home}/SDKs/android-ndk-r4-crystax" juceFolder="../../../juce"
+             androidInternetNeeded="1"/>
   </EXPORTFORMATS>
   <CONFIGURATIONS>
     <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="JuceDemo"
diff --git a/src/gui/components/controls/juce_ListBox.cpp b/src/gui/components/controls/juce_ListBox.cpp
index 22d164223a..5fa3dcf41c 100644
--- a/src/gui/components/controls/juce_ListBox.cpp
+++ b/src/gui/components/controls/juce_ListBox.cpp
@@ -768,8 +768,22 @@ bool ListBox::keyStateChanged (const bool isKeyDown)
 
 void ListBox::mouseWheelMove (const MouseEvent& e, float wheelIncrementX, float wheelIncrementY)
 {
-    getHorizontalScrollBar()->mouseWheelMove (e, wheelIncrementX, 0);
-    getVerticalScrollBar()->mouseWheelMove (e, 0, wheelIncrementY);
+    bool eventWasUsed = false;
+
+    if (viewport->getHorizontalScrollBar()->isVisible() && wheelIncrementX != 0)
+    {
+        eventWasUsed = true;
+        viewport->getHorizontalScrollBar()->mouseWheelMove (e, wheelIncrementX, 0);
+    }
+    
+    if (viewport->getVerticalScrollBar()->isVisible() && wheelIncrementY != 0)
+    {
+        eventWasUsed = true;
+        viewport->getVerticalScrollBar()->mouseWheelMove (e, 0, wheelIncrementY);
+    }
+
+    if (! eventWasUsed)
+        Component::mouseWheelMove (e, wheelIncrementX, wheelIncrementY);
 }
 
 void ListBox::mouseMove (const MouseEvent& e)