diff --git a/Builds/Win/Release.sln b/Builds/Win/Ctrlr.sln
similarity index 60%
rename from Builds/Win/Release.sln
rename to Builds/Win/Ctrlr.sln
index 396b77a3c..bc6fd6f1e 100644
--- a/Builds/Win/Release.sln
+++ b/Builds/Win/Ctrlr.sln
@@ -3,16 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 14 for Windows Desktop
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_Standalone", "Standalone\Ctrlr_Standalone.vcxproj", "{AE5BFF94-9212-18D5-D78C-303C614D5D47}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Standalone", "Standalone\Ctrlr_Standalone.vcxproj", "{AE5BFF94-9212-18D5-D78C-303C614D5D47}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_Plugin_VST", "Vst\Ctrlr_Plugin_VST.vcxproj", "{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VST", "Vst\Ctrlr_Plugin_VST.vcxproj", "{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release_Nightly|Win32 = Release_Nightly|Win32
-		Release_Nightly|x64 = Release_Nightly|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
@@ -21,10 +19,6 @@ Global
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|Win32.Build.0 = Debug|Win32
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|x64.ActiveCfg = Debug|x64
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|x64.Build.0 = Debug|x64
-		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|Win32.ActiveCfg = Release_Nightly|Win32
-		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|Win32.Build.0 = Release_Nightly|Win32
-		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|x64.ActiveCfg = Release_Nightly|x64
-		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|x64.Build.0 = Release_Nightly|x64
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|Win32.ActiveCfg = Release|Win32
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|Win32.Build.0 = Release|Win32
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|x64.ActiveCfg = Release|x64
@@ -32,12 +26,10 @@ Global
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|Win32.Build.0 = Debug|Win32
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|x64.ActiveCfg = Debug|Win32
-		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|Win32.ActiveCfg = Release_Nightly|Win32
-		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|Win32.Build.0 = Release_Nightly|Win32
-		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|x64.ActiveCfg = Release_Nightly|Win32
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|Win32.ActiveCfg = Release|Win32
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|Win32.Build.0 = Release|Win32
-		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.ActiveCfg = Release|Win32
+		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.ActiveCfg = Release|x64
+		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Builds/Win/Standalone/Ctrlr_Standalone.vcxproj b/Builds/Win/Standalone/Ctrlr_Standalone.vcxproj
index cca4d42a7..173c6bb46 100644
--- a/Builds/Win/Standalone/Ctrlr_Standalone.vcxproj
+++ b/Builds/Win/Standalone/Ctrlr_Standalone.vcxproj
@@ -29,6 +29,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{AE5BFF94-9212-18D5-D78C-303C614D5D47}</ProjectGuid>
     <PlatformToolset>v140_xp</PlatformToolset>
+    <WindowsTargetPlatformVersion>1</WindowsTargetPlatformVersion>
+    <ProjectName>Standalone</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -76,8 +78,8 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Ctrlr-Debug-$(Platform)$(NATIVE_ARCH)</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Ctrlr-$(Platform)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ctrlr-$(Platform)</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|Win32'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
@@ -86,6 +88,17 @@
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|x64'">true</GenerateManifest>
     <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|x64'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -98,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -149,7 +162,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -196,7 +209,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -206,14 +219,14 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
-      <AdditionalOptions>/Yu"stdafx.h" /MP /Fp"stdafx.pch" /Zm2000 /bigobj </AdditionalOptions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <AdditionalOptions>/MP /Zm2000 /bigobj </AdditionalOptions>
+      <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <OutputFile>$(OutDir)\Ctrlr-$(Platform)$(NATIVE_ARCH).exe</OutputFile>
+      <OutputFile>$(OutDir)\Ctrlr-$(Platform).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -241,7 +254,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -252,14 +265,14 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
-      <AdditionalOptions>/Yu"stdafx.h" /MP /Fp"stdafx.pch" /Zm2000 /bigobj </AdditionalOptions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <AdditionalOptions>/MP /Zm2000 /bigobj </AdditionalOptions>
+      <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <OutputFile>$(OutDir)\Ctrlr-$(Platform)$(NATIVE_ARCH).exe</OutputFile>
+      <OutputFile>$(OutDir)\Ctrlr-$(Platform).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -286,7 +299,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_FORCE_DEBUG=0;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;JUCE_FORCE_DEBUG=0;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -335,7 +348,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_FORCE_DEBUG=0;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;JUCE_FORCE_DEBUG=0;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -416,7 +429,7 @@
     <ClCompile Include="..\..\..\Source\Core\stdafx_luabind.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.h.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx_luabind.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx_luabind.h.pch</PrecompiledHeaderOutputFile>
@@ -3284,7 +3297,6 @@
     <ClInclude Include="..\..\..\Source\Core\CtrlrFontManager.h" />
     <ClInclude Include="..\..\..\Source\Core\CtrlrIDManager.h" />
     <ClInclude Include="..\..\..\Source\Core\CtrlrIDs.h" />
-    <ClInclude Include="..\..\..\Source\Core\CtrlrInlineUtilities.h" />
     <ClInclude Include="..\..\..\Source\Core\CtrlrLog.h" />
     <ClInclude Include="..\..\..\Source\Core\CtrlrMacros.h" />
     <ClInclude Include="..\..\..\Source\Core\CtrlrMainPage.h" />
diff --git a/Builds/Win/Standalone/Ctrlr_Standalone.vcxproj.filters b/Builds/Win/Standalone/Ctrlr_Standalone.vcxproj.filters
index aace1b524..04f543f23 100644
--- a/Builds/Win/Standalone/Ctrlr_Standalone.vcxproj.filters
+++ b/Builds/Win/Standalone/Ctrlr_Standalone.vcxproj.filters
@@ -2741,9 +2741,6 @@
     <ClInclude Include="..\..\..\Source\Core\CtrlrIDs.h">
       <Filter>Ctrlr_Standalone\Core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\Core\CtrlrInlineUtilities.h">
-      <Filter>Ctrlr_Standalone\Core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Source\Core\CtrlrLog.h">
       <Filter>Ctrlr_Standalone\Core</Filter>
     </ClInclude>
@@ -5828,6 +5825,45 @@
     <ClInclude Include="..\..\..\JUCE\modules\juce_gui_basics\juce_gui_basics.h" />
     <ClInclude Include="..\..\..\JUCE\modules\juce_gui_extra\juce_gui_extra.h" />
     <ClInclude Include="..\..\..\JUCE\modules\juce_opengl\juce_opengl.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_basics\juce_audio_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_devices\juce_audio_devices.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_formats\juce_audio_formats.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_processors\juce_audio_processors.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_utils\juce_audio_utils.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_core\juce_core.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_cryptography\juce_cryptography.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_data_structures\juce_data_structures.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_events\juce_events.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_graphics\juce_graphics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_basics\juce_gui_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_extra\juce_gui_extra.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_opengl\juce_opengl.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_basics\juce_audio_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_devices\juce_audio_devices.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_formats\juce_audio_formats.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_processors\juce_audio_processors.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_utils\juce_audio_utils.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_core\juce_core.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_cryptography\juce_cryptography.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_data_structures\juce_data_structures.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_events\juce_events.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_graphics\juce_graphics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_basics\juce_gui_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_extra\juce_gui_extra.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_opengl\juce_opengl.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_basics\juce_audio_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_devices\juce_audio_devices.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_formats\juce_audio_formats.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_processors\juce_audio_processors.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_utils\juce_audio_utils.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_core\juce_core.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_cryptography\juce_cryptography.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_data_structures\juce_data_structures.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_events\juce_events.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_graphics\juce_graphics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_basics\juce_gui_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_extra\juce_gui_extra.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_opengl\juce_opengl.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Source\Resources\Lua\inspect.lua">
diff --git a/Builds/Win/Standalone/Ctrlr_Standalone.sln b/Builds/Win/Standalone/Standalone.sln
similarity index 66%
rename from Builds/Win/Standalone/Ctrlr_Standalone.sln
rename to Builds/Win/Standalone/Standalone.sln
index c0d0e7669..37b890c9b 100644
--- a/Builds/Win/Standalone/Ctrlr_Standalone.sln
+++ b/Builds/Win/Standalone/Standalone.sln
@@ -2,14 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 14 for Windows Desktop
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_Standalone", "Ctrlr_Standalone.vcxproj", "{AE5BFF94-9212-18D5-D78C-303C614D5D47}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Standalone", "Ctrlr_Standalone.vcxproj", "{AE5BFF94-9212-18D5-D78C-303C614D5D47}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release_Nightly|Win32 = Release_Nightly|Win32
-		Release_Nightly|x64 = Release_Nightly|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
@@ -18,10 +16,6 @@ Global
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|Win32.Build.0 = Debug|Win32
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|x64.ActiveCfg = Debug|x64
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|x64.Build.0 = Debug|x64
-		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|Win32.ActiveCfg = Release_Nightly|Win32
-		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|Win32.Build.0 = Release_Nightly|Win32
-		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|x64.ActiveCfg = Release_Nightly|x64
-		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|x64.Build.0 = Release_Nightly|x64
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|Win32.ActiveCfg = Release|Win32
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|Win32.Build.0 = Release|Win32
 		{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|x64.ActiveCfg = Release|x64
diff --git a/Builds/Win/Vst/Ctrlr_Plugin_VST.vcxproj b/Builds/Win/Vst/Ctrlr_Plugin_VST.vcxproj
index 5330ac2b1..36e95273a 100644
--- a/Builds/Win/Vst/Ctrlr_Plugin_VST.vcxproj
+++ b/Builds/Win/Vst/Ctrlr_Plugin_VST.vcxproj
@@ -31,6 +31,7 @@
     <PlatformToolset>v140_xp</PlatformToolset>
     <WindowsTargetPlatformVersion>
     </WindowsTargetPlatformVersion>
+    <ProjectName>VST</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -80,8 +81,8 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Ctrlr-VST-Debug-$(Platform)$(NATIVE_ARCH)</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Ctrlr-VST-$(Platform)$(NATIVE_ARCH)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ctrlr-VST-$(Platform)$(NATIVE_ARCH)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Ctrlr-VST-$(Platform)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ctrlr-VST-$(Platform)</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|Win32'">Ctrlr-VST-$(Platform)$(NATIVE_ARCH)</TargetName>
@@ -90,6 +91,13 @@
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|x64'">true</GenerateManifest>
     <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -102,7 +110,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_VST;JUCER_VS2015_AE7D5B65=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_VST;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -151,7 +159,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_VST;JUCER_VS2015_AE7D5B65=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_VST;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -199,7 +207,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_AE7D5B65=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_VST;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -210,12 +218,13 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/MP  /Zm2000 /bigobj %(AdditionalOptions)</AdditionalOptions>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <OutputFile>$(OutDir)\Ctrlr-VST-$(Platform)$(NATIVE_ARCH).dll</OutputFile>
+      <OutputFile>$(OutDir)\Ctrlr-VST-$(Platform).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -226,6 +235,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <LargeAddressAware>true</LargeAddressAware>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LinkTimeCodeGeneration />
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -243,7 +253,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_AE7D5B65=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_VST;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -255,12 +265,13 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/MP  /Zm2000 /bigobj %(AdditionalOptions)</AdditionalOptions>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <OutputFile>$(OutDir)\Ctrlr-VST-$(Platform)$(NATIVE_ARCH).dll</OutputFile>
+      <OutputFile>$(OutDir)\Ctrlr-VST-$(Platform).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -270,6 +281,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <LargeAddressAware>true</LargeAddressAware>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LinkTimeCodeGeneration />
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -287,7 +299,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_VST;JUCER_VS2015_AE7D5B65=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_VST;NDEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_VST;JUCER_VS2015_AE7D5B65=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -334,7 +346,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_VST;JUCER_VS2015_AE7D5B65=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_VST;NDEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_VST;JUCER_VS2015_AE7D5B65=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
diff --git a/Builds/Win/Vst/Ctrlr_Plugin_VST.vcxproj.filters b/Builds/Win/Vst/Ctrlr_Plugin_VST.vcxproj.filters
index e1bdb94ad..a3d965f19 100644
--- a/Builds/Win/Vst/Ctrlr_Plugin_VST.vcxproj.filters
+++ b/Builds/Win/Vst/Ctrlr_Plugin_VST.vcxproj.filters
@@ -5972,6 +5972,34 @@
     <ClInclude Include="..\..\..\JUCE\modules\juce_gui_basics\juce_gui_basics.h" />
     <ClInclude Include="..\..\..\JUCE\modules\juce_gui_extra\juce_gui_extra.h" />
     <ClInclude Include="..\..\..\JUCE\modules\juce_opengl\juce_opengl.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_basics\juce_audio_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_devices\juce_audio_devices.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_formats\juce_audio_formats.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_plugin_client\juce_audio_plugin_client.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_processors\juce_audio_processors.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_utils\juce_audio_utils.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_core\juce_core.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_cryptography\juce_cryptography.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_data_structures\juce_data_structures.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_events\juce_events.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_graphics\juce_graphics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_basics\juce_gui_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_extra\juce_gui_extra.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_opengl\juce_opengl.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_basics\juce_audio_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_devices\juce_audio_devices.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_formats\juce_audio_formats.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_plugin_client\juce_audio_plugin_client.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_processors\juce_audio_processors.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_audio_utils\juce_audio_utils.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_core\juce_core.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_cryptography\juce_cryptography.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_data_structures\juce_data_structures.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_events\juce_events.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_graphics\juce_graphics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_basics\juce_gui_basics.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_gui_extra\juce_gui_extra.h" />
+    <ClInclude Include="..\..\..\JUCE\modules\juce_opengl\juce_opengl.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Source\Core\CtrlrRevision.template">
diff --git a/Builds/Win/Vst/Ctrlr_Plugin_VST.sln b/Builds/Win/Vst/VST.sln
similarity index 66%
rename from Builds/Win/Vst/Ctrlr_Plugin_VST.sln
rename to Builds/Win/Vst/VST.sln
index ee8fb1677..0c5d4a7d5 100644
--- a/Builds/Win/Vst/Ctrlr_Plugin_VST.sln
+++ b/Builds/Win/Vst/VST.sln
@@ -2,14 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 14 for Windows Desktop
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_Plugin_VST", "Ctrlr_Plugin_VST.vcxproj", "{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VST", "Ctrlr_Plugin_VST.vcxproj", "{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release_Nightly|Win32 = Release_Nightly|Win32
-		Release_Nightly|x64 = Release_Nightly|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
@@ -18,10 +16,6 @@ Global
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|Win32.Build.0 = Debug|Win32
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|x64.ActiveCfg = Debug|x64
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|x64.Build.0 = Debug|x64
-		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|Win32.ActiveCfg = Release_Nightly|Win32
-		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|Win32.Build.0 = Release_Nightly|Win32
-		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|x64.ActiveCfg = Release_Nightly|x64
-		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|x64.Build.0 = Release_Nightly|x64
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|Win32.ActiveCfg = Release|Win32
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|Win32.Build.0 = Release|Win32
 		{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.ActiveCfg = Release|x64
diff --git a/Packaging/Windows/ctrlr.nsi b/Packaging/Windows/ctrlr.nsi
index f627c7956..7f93a4690 100644
--- a/Packaging/Windows/ctrlr.nsi
+++ b/Packaging/Windows/ctrlr.nsi
@@ -104,14 +104,14 @@ SectionGroup /e "Standalone" PROG1
 
 	Section "32bit binary" SEC1
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Bin\Ctrlr-Win32.exe"
+		File			"..\..\Builds\Win\Release\Ctrlr-Win32.exe"
 		WriteUninstaller	"$INSTDIR\Uninstall.exe"
 		Call RegisterApplication
 	SectionEnd
 	
 	Section "64bit binary" SEC2
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Bin\Ctrlr-x64.exe"
+		File			"..\..\Builds\Win\Release\Ctrlr-x64.exe"
 		WriteUninstaller	"$INSTDIR\Uninstall.exe"
 		Call RegisterApplication
 	SectionEnd
@@ -119,7 +119,7 @@ SectionGroup /e "Standalone" PROG1
 	Section "Docs and examples" SEC3
 		SetOutPath 	"$INSTDIR"
 		File			/r "..\..\Doc"
-		File			/r "..\..\Panels"
+		File			/r "..\..\..\Panels"
 		WriteUninstaller 	"$INSTDIR\Uninstall.exe"
 	SectionEnd
   
@@ -137,12 +137,12 @@ SectionGroup /e "VST" PROG2
 
 	Section "Executables Win32" SEC5
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Bin\Ctrlr-VST-Win32.dll"		
+		File			"..\..\Builds\Win\Release\Ctrlr-VST-Win32.dll"		
 	SectionEnd
 	
 	Section "Executables x64" SEC6
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Bin\Ctrlr-VST-x64.dll"
+		File			"..\..\Builds\Win\Release\Ctrlr-VST-x64.dll"
 	SectionEnd
 	
 SectionGroupEnd
diff --git a/Scripts/post-commit b/Scripts/post-commit
index 4fba6058e..ff5c6f54a 100644
--- a/Scripts/post-commit
+++ b/Scripts/post-commit
@@ -126,21 +126,21 @@ function windows_copy_to_website {
 function windows_msbuild {	
 	if [ -e "$MSBUILD" ]; then
 		echo "CTRLR: $MSBUILD found"
-		echo cd $CTRLR_ROOT/Builds
-		cd $CTRLR_ROOT/Builds
+		echo cd $CTRLR_ROOT/Builds/Win
+		cd $CTRLR_ROOT/Builds/Win
 		
 		echo "CTRLR: Build Win32"
-		echo "$MSBUILD" Ctrlr_Release.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win32.build.log /property:Configuration=Release_Nightly /property:VisualStudioVersion=14.0 /property:Platform=Win32
-		"$MSBUILD" Ctrlr_Release.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win32.build.log /property:Configuration=Release_Nightly /property:VisualStudioVersion=14.0 /property:Platform=Win32
+		echo "$MSBUILD" Ctrlr.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win32.build.log /property:Configuration=Release /property:VisualStudioVersion=14.0 /property:Platform=Win32
+		"$MSBUILD" Ctrlr.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win32.build.log /property:Configuration=Release /property:VisualStudioVersion=14.0 /property:Platform=Win32
 		
 		if [ $? -ne 0 ]; then
 			echo "CTRLR: Win32 build failed"
 			exit 1
 		fi
 		echo "CTRLR: Build x64"
-		echo "$MSBUILD" Ctrlr_Release.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win64.build.log /property:Configuration=Release_Nightly /property:VisualStudioVersion=14.0 /property:Platform=x64
+		echo "$MSBUILD" Ctrlr.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win64.build.log /property:Configuration=Release /property:VisualStudioVersion=14.0 /property:Platform=x64
 		
-		"$MSBUILD" Ctrlr_Release.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win64.build.log /property:Configuration=Release_Nightly /property:VisualStudioVersion=14.0 /property:Platform=x64
+		"$MSBUILD" Ctrlr.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win64.build.log /property:Configuration=Release /property:VisualStudioVersion=14.0 /property:Platform=x64
 		if [ $? -ne 0 ]; then
 			echo "CTRLR: x64 build failed"
 			exit 1
@@ -409,5 +409,5 @@ function build_now_linux {
 
 detect_os
 #build_now
-#windows_create_installer
-windows_copy_to_website
\ No newline at end of file
+windows_create_installer
+#windows_copy_to_website
diff --git a/Source/Core/CtrlrMasterClock.cpp b/Source/Core/CtrlrMasterClock.cpp
index 8c893dd1d..222810ac9 100644
--- a/Source/Core/CtrlrMasterClock.cpp
+++ b/Source/Core/CtrlrMasterClock.cpp
@@ -68,7 +68,7 @@ bool CtrlrMasterClock::isRunning()
 	return (running);
 }
 
-int CtrlrMasterClock::getElapsedMilliseconds (const int64 ticksStart, const int64 ticksEnd)
+int CtrlrMasterClock::getElapsedMilliseconds (const int64 _ticksStart, const int64 ticksEnd)
 {
-	return ( (( (ticksEnd ? ticksEnd : Time::getHighResolutionTicks()) - ticksStart) * ticksPerSecond) / 1000);
+	return ( (( (ticksEnd ? ticksEnd : Time::getHighResolutionTicks()) - _ticksStart) * ticksPerSecond) / 1000);
 }
diff --git a/Source/Core/CtrlrPanel/CtrlrEvaluationScopes.h b/Source/Core/CtrlrPanel/CtrlrEvaluationScopes.h
index d8c208f92..c09c92269 100644
--- a/Source/Core/CtrlrPanel/CtrlrEvaluationScopes.h
+++ b/Source/Core/CtrlrPanel/CtrlrEvaluationScopes.h
@@ -1,7 +1,7 @@
-#ifndef __CTRLR_EVALUATION_SCOPES__
-#define __CTRLR_EVALUATION_SCOPES__
+#ifndef CTRLR_EVALUATION_SCOPES
+#define CTRLR_EVALUATION_SCOPES
 
-#include "JuceHeader.h"
+#include "CtrlrMacros.h"
 
 class CtrlrPanel;
 
diff --git a/Source/Core/CtrlrRevision.h b/Source/Core/CtrlrRevision.h
index 4f341a8bb..9ecca2ddf 100644
--- a/Source/Core/CtrlrRevision.h
+++ b/Source/Core/CtrlrRevision.h
@@ -1,7 +1,7 @@
 #ifndef __CTRLR_REVISION__
 #define __CTRLR_REVISION__
 
-static const char *ctrlrRevision              	= "5.4.27";
-static const char *ctrlrRevisionDate        	= "Thu Dec 15 16:30:15 CEST 2016";
+static const char *ctrlrRevision              	= "5.4.52";
+static const char *ctrlrRevisionDate        	= "Thu, Mar 30, 2017  6:26:23 PM";
 
 #endif
diff --git a/Source/Lua/CtrlrLuaUtils.cpp b/Source/Lua/CtrlrLuaUtils.cpp
index 5ffd9305e..6dbc5596e 100644
--- a/Source/Lua/CtrlrLuaUtils.cpp
+++ b/Source/Lua/CtrlrLuaUtils.cpp
@@ -219,15 +219,6 @@ StringArray CtrlrLuaUtils::getMidiOutputDevices()
 	return ( MidiOutput::getDevices() );
 }
 
-void CtrlrLuaUtils::testMethod(const String &haystack, const String &needle)
-{
-	String haystackCopy(haystack);
-
-	bool ret1 = haystack.startsWith(needle);
-	bool ret2 = haystackCopy.startsWith(needle);
-
-	_DBG("ret1: " + _STR(ret1) + " ret2: " + _STR(ret2) + " haystack: [" + haystack + "]" + " needle: [" + needle + "]" + " haystackCopy: " + haystackCopy);
-}
 void CtrlrLuaUtils::wrapForLua (lua_State *L)
 {
 	using namespace luabind;
@@ -252,6 +243,5 @@ void CtrlrLuaUtils::wrapForLua (lua_State *L)
 			.def("getVersionRevision", &CtrlrLuaUtils::getVersionRevision)
 			.def("getVersionString", &CtrlrLuaUtils::getVersionString)
 			.def("getPi", &CtrlrLuaUtils::getPi)
-			.def("testMethod", &CtrlrLuaUtils::testMethod)
 	];
 }