diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index 81bb90544..a9114c48e 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -221,6 +221,7 @@
         $(SrcDir)msvc\;
         $(AegisubContribBase)iconv\include;
         $(AegisubSourceBase)libaegisub\include;
+        $(AegisubSourceBase)build;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index f1176bded..43f61d13e 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -23,18 +23,10 @@
     <ProjectGuid>{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}</ProjectGuid>
     <RootNamespace>Aegisub</RootNamespace>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <PropertyGroup Label="Configuration">
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
+
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>exe</AegisubProjectType>
@@ -46,6 +38,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
+
   <!-- Project specific configuration -->
   <Import Project="$(MSBuildThisFileDirectory)Aegisub.targets" />
   <PropertyGroup>
@@ -59,6 +52,7 @@
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
+
   <!-- Source files -->
   <ItemGroup>
     <ClInclude Include="$(SrcDir)aegisublocale.h" />
@@ -151,7 +145,6 @@
     <ClInclude Include="$(SrcDir)fft.h" />
     <ClInclude Include="$(SrcDir)font_file_lister.h" />
     <ClInclude Include="$(SrcDir)font_file_lister_fontconfig.h" />
-    <ClInclude Include="$(SrcDir)font_file_lister_freetype.h" />
     <ClInclude Include="$(SrcDir)frame_main.h" />
     <ClInclude Include="$(SrcDir)gl_text.h" />
     <ClInclude Include="$(SrcDir)gl_wrap.h" />
@@ -159,7 +152,6 @@
     <ClInclude Include="$(SrcDir)hotkeys.h" />
     <ClInclude Include="$(SrcDir)hotkey_data_view_model.h" />
     <ClInclude Include="$(SrcDir)kana_table.h" />
-    <ClInclude Include="$(SrcDir)keyframe.h" />
     <ClInclude Include="$(SrcDir)main.h" />
     <ClInclude Include="$(SrcDir)MatroskaParser.h" />
     <ClInclude Include="$(SrcDir)md5.h" />
@@ -225,14 +217,20 @@
     <ClInclude Include="$(SrcDir)visual_tool_rotatez.h" />
     <ClInclude Include="$(SrcDir)visual_tool_scale.h" />
     <ClInclude Include="$(SrcDir)visual_tool_vector_clip.h" />
+    <ClInclude Include="$(SrcDir)ass_parser.h" />
+    <ClInclude Include="$(SrcDir)audio_provider_lock.h" />
+    <ClInclude Include="$(SrcDir)dialog_manager.h" />
+    <ClInclude Include="$(SrcDir)placeholder_ctrl.h" />
+    <ClInclude Include="$(SrcDir)scintilla_text_selection_controller.h" />
+    <ClInclude Include="$(SrcDir)text_selection_controller.h" />
+    <ClInclude Include="$(SrcDir)time_range.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(SrcDir)aegisublocale.cpp" />
     <ClCompile Include="$(SrcDir)agi_pre.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>agi_pre.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>
-      </ForcedIncludeFiles>
+      <ForcedIncludeFiles></ForcedIncludeFiles>
     </ClCompile>
     <ClCompile Include="$(SrcDir)ass_attachment.cpp" />
     <ClCompile Include="$(SrcDir)ass_dialogue.cpp" />
@@ -292,7 +290,6 @@
     <ClCompile Include="$(SrcDir)command\grid.cpp" />
     <ClCompile Include="$(SrcDir)command\help.cpp" />
     <ClCompile Include="$(SrcDir)command\icon.cpp" />
-    <ClCompile Include="$(SrcDir)command\keyframe.cpp" />
     <ClCompile Include="$(SrcDir)command\recent.cpp" />
     <ClCompile Include="$(SrcDir)command\subtitle.cpp" />
     <ClCompile Include="$(SrcDir)command\time.cpp" />
@@ -336,7 +333,6 @@
     <ClCompile Include="$(SrcDir)fft.cpp" />
     <ClCompile Include="$(SrcDir)font_file_lister.cpp" />
     <ClCompile Include="$(SrcDir)font_file_lister_fontconfig.cpp" />
-    <ClCompile Include="$(SrcDir)font_file_lister_freetype.cpp" />
     <ClCompile Include="$(SrcDir)frame_main.cpp" />
     <ClCompile Include="$(SrcDir)gl_text.cpp" />
     <ClCompile Include="$(SrcDir)gl_wrap.cpp" />
@@ -347,13 +343,11 @@
     <ClCompile Include="$(SrcDir)main.cpp" />
     <ClCompile Include="$(SrcDir)MatroskaParser.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <ForcedIncludeFiles>
-      </ForcedIncludeFiles>
+      <ForcedIncludeFiles></ForcedIncludeFiles>
     </ClCompile>
     <ClCompile Include="$(SrcDir)md5.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <ForcedIncludeFiles>
-      </ForcedIncludeFiles>
+      <ForcedIncludeFiles></ForcedIncludeFiles>
     </ClCompile>
     <ClCompile Include="$(SrcDir)menu.cpp" />
     <ClCompile Include="$(SrcDir)mkv_wrap.cpp" />
@@ -420,6 +414,10 @@
     <ClCompile Include="$(SrcDir)visual_tool_rotatez.cpp" />
     <ClCompile Include="$(SrcDir)visual_tool_scale.cpp" />
     <ClCompile Include="$(SrcDir)visual_tool_vector_clip.cpp" />
+    <ClCompile Include="$(SrcDir)ass_parser.cpp" />
+    <ClCompile Include="$(SrcDir)audio_provider_lock.cpp" />
+    <ClCompile Include="$(SrcDir)scintilla_text_selection_controller.cpp" />
+    <ClCompile Include="$(SrcDir)command\keyframe.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="$(SrcDir)res.rc" />
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj.filters b/aegisub/build/Aegisub/Aegisub.vcxproj.filters
index 80c12a962..11f7c7baf 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj.filters
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj.filters
@@ -279,9 +279,6 @@
     <ClInclude Include="$(SrcDir)font_file_lister.h">
       <Filter>Features\Font collector</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)font_file_lister_freetype.h">
-      <Filter>Features\Font collector</Filter>
-    </ClInclude>
     <ClInclude Include="$(SrcDir)font_file_lister_fontconfig.h">
       <Filter>Features\Font collector</Filter>
     </ClInclude>
@@ -480,9 +477,6 @@
     <ClInclude Include="$(SrcDir)MatroskaParser.h">
       <Filter>AV support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)keyframe.h">
-      <Filter>Video</Filter>
-    </ClInclude>
     <ClInclude Include="$(SrcDir)mkv_wrap.h">
       <Filter>AV support</Filter>
     </ClInclude>
@@ -639,6 +633,27 @@
     <ClInclude Include="$(SrcDir)pen.h">
       <Filter>Utilities\UI utilities</Filter>
     </ClInclude>
+    <ClInclude Include="$(SrcDir)text_selection_controller.h">
+      <Filter>Main UI\Edit box</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)ass_parser.h">
+      <Filter>ASS</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)scintilla_text_selection_controller.h">
+      <Filter>Main UI\Edit box</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_provider_lock.h">
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_manager.h">
+      <Filter>Utilities\UI utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)time_range.h">
+      <Filter>Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)placeholder_ctrl.h">
+      <Filter>Controls</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(SrcDir)ass_dialogue.cpp">
@@ -875,9 +890,6 @@
     <ClCompile Include="$(SrcDir)font_file_lister_fontconfig.cpp">
       <Filter>Features\Font collector</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)font_file_lister_freetype.cpp">
-      <Filter>Features\Font collector</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)dialog_fonts_collector.cpp">
       <Filter>Features\Font collector</Filter>
     </ClCompile>
@@ -995,9 +1007,6 @@
     <ClCompile Include="$(SrcDir)MatroskaParser.c">
       <Filter>AV support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)command\keyframe.cpp">
-      <Filter>Video</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)mkv_wrap.cpp">
       <Filter>AV support</Filter>
     </ClCompile>
@@ -1181,6 +1190,18 @@
     <ClCompile Include="$(SrcDir)pen.cpp">
       <Filter>Utilities\UI utilities</Filter>
     </ClCompile>
+    <ClCompile Include="$(SrcDir)ass_parser.cpp">
+      <Filter>ASS</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)scintilla_text_selection_controller.cpp">
+      <Filter>Main UI\Edit box</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider_lock.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\keyframe.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="$(SrcDir)res.rc">