diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
index 99392224b..aa91a6be9 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
@@ -67,7 +67,7 @@
     <ClInclude Include="$(SrcDir)audio_controller.h" />
     <ClInclude Include="$(SrcDir)audio_display.h" />
     <ClInclude Include="$(SrcDir)audio_karaoke.h" />
-    <ClInclude Include="$(SrcDir)audio_marker_provider_keyframes.h" />
+    <ClInclude Include="$(SrcDir)audio_marker.h" />
     <ClInclude Include="$(SrcDir)audio_player_alsa.h" />
     <ClInclude Include="$(SrcDir)audio_player_dsound.h" />
     <ClInclude Include="$(SrcDir)audio_player_dsound2.h" />
@@ -151,7 +151,6 @@
     <ClInclude Include="$(SrcDir)MatroskaParser.h" />
     <ClInclude Include="$(SrcDir)md5.h" />
     <ClInclude Include="$(SrcDir)mkv_wrap.h" />
-    <ClInclude Include="$(SrcDir)mythes.hxx" />
     <ClInclude Include="$(SrcDir)persist_location.h" />
     <ClInclude Include="$(SrcDir)pen.h" />
     <ClInclude Include="$(SrcDir)plugin_manager.h" />
@@ -182,7 +181,6 @@
     <ClInclude Include="$(SrcDir)text_file_reader.h" />
     <ClInclude Include="$(SrcDir)text_file_writer.h" />
     <ClInclude Include="$(SrcDir)thesaurus.h" />
-    <ClInclude Include="$(SrcDir)thesaurus_myspell.h" />
     <ClInclude Include="$(SrcDir)threaded_frame_source.h" />
     <ClInclude Include="$(SrcDir)timeedit_ctrl.h" />
     <ClInclude Include="$(SrcDir)toggle_bitmap.h" />
@@ -238,7 +236,7 @@
     <ClCompile Include="$(SrcDir)audio_controller.cpp" />
     <ClCompile Include="$(SrcDir)audio_display.cpp" />
     <ClCompile Include="$(SrcDir)audio_karaoke.cpp" />
-    <ClCompile Include="$(SrcDir)audio_marker_provider_keyframes.cpp" />
+    <ClCompile Include="$(SrcDir)audio_marker.cpp" />
     <ClCompile Include="$(SrcDir)audio_player.cpp" />
     <ClCompile Include="$(SrcDir)audio_player_alsa.cpp" />
     <ClCompile Include="$(SrcDir)audio_player_dsound.cpp" />
@@ -343,7 +341,6 @@
     </ClCompile>
     <ClCompile Include="$(SrcDir)menu.cpp" />
     <ClCompile Include="$(SrcDir)mkv_wrap.cpp" />
-    <ClCompile Include="$(SrcDir)mythes.cxx" />
     <ClCompile Include="$(SrcDir)pen.cpp" />
     <ClCompile Include="$(SrcDir)persist_location.cpp" />
     <ClCompile Include="$(SrcDir)plugin_manager.cpp" />
@@ -375,7 +372,6 @@
     <ClCompile Include="$(SrcDir)text_file_reader.cpp" />
     <ClCompile Include="$(SrcDir)text_file_writer.cpp" />
     <ClCompile Include="$(SrcDir)thesaurus.cpp" />
-    <ClCompile Include="$(SrcDir)thesaurus_myspell.cpp" />
     <ClCompile Include="$(SrcDir)threaded_frame_source.cpp" />
     <ClCompile Include="$(SrcDir)timeedit_ctrl.cpp" />
     <ClCompile Include="$(SrcDir)toggle_bitmap.cpp" />
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
index fe37aa465..0c808a32b 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
@@ -207,7 +207,7 @@
     <ClInclude Include="$(SrcDir)audio_karaoke.h">
       <Filter>Audio\UI</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_marker_provider_keyframes.h">
+    <ClInclude Include="$(SrcDir)audio_marker.h">
       <Filter>Audio\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)audio_renderer.h">
@@ -378,12 +378,6 @@
     <ClInclude Include="$(SrcDir)spellchecker_hunspell.h">
       <Filter>Features\Spell checker</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)mythes.hxx">
-      <Filter>Features\Thesaurus</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)thesaurus_myspell.h">
-      <Filter>Features\Thesaurus</Filter>
-    </ClInclude>
     <ClInclude Include="$(SrcDir)thesaurus.h">
       <Filter>Features\Thesaurus</Filter>
     </ClInclude>
@@ -707,7 +701,7 @@
     <ClCompile Include="$(SrcDir)audio_karaoke.cpp">
       <Filter>Audio\UI</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_marker_provider_keyframes.cpp">
+    <ClCompile Include="$(SrcDir)audio_marker.cpp">
       <Filter>Audio\UI</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)audio_renderer.cpp">
@@ -956,15 +950,9 @@
     <ClCompile Include="$(SrcDir)spellchecker_hunspell.cpp">
       <Filter>Features\Spell checker</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)mythes.cxx">
-      <Filter>Features\Thesaurus</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)thesaurus.cpp">
       <Filter>Features\Thesaurus</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)thesaurus_myspell.cpp">
-      <Filter>Features\Thesaurus</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)dialog_resample.cpp">
       <Filter>Features\Resolution resampler</Filter>
     </ClCompile>
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.xml b/aegisub/build/msbuild/Aegisub/Aegisub.xml
index 25f9a0175..ef6f46f13 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.xml
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.xml
@@ -119,7 +119,7 @@
   </StringProperty>
 
   <BoolProperty
-    Name="AegisubUseFt2"
+    Name="AegisubUseFreetype2"
     Category="Features"
     DisplayName="Use Freetype 2"
     Description="Specify whether to use Freetype 2 for font enumeration in the Font Collector. You will need to configure the location of the Freetype 2 library on the Library paths page."
diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
index 8055a8eff..a103002d7 100644
--- a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
+++ b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
@@ -65,6 +65,7 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\path.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\scoped_ptr.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\signal.h" />
+    <ClInclude Include="$(SrcDir)include\libaegisub\thesaurus.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\types.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\util.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\util_osx.h" />
@@ -95,6 +96,7 @@
     <ClCompile Include="$(SrcDir)common\option.cpp" />
     <ClCompile Include="$(SrcDir)common\option_visit.cpp" />
     <ClCompile Include="$(SrcDir)common\path.cpp" />
+    <ClCompile Include="$(SrcDir)common\thesaurus.cpp" />
     <ClCompile Include="$(SrcDir)common\util.cpp" />
     <ClCompile Include="$(SrcDir)common\validator.cpp" />
     <ClCompile Include="$(SrcDir)common\vfr.cpp" />
diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
index 697d6f0b0..71fa5700e 100644
--- a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
+++ b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
@@ -71,6 +71,9 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\scoped_ptr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(SrcDir)include\libaegisub\thesaurus.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(SrcDir)include\libaegisub\types.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -160,6 +163,9 @@
     <ClCompile Include="$(SrcDir)common\path.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
+    <ClCompile Include="$(SrcDir)common\thesaurus.cpp">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
     <ClCompile Include="$(SrcDir)windows\util_win.cpp">
       <Filter>Source Files\Windows</Filter>
     </ClCompile>