diff --git a/build/scintilla/scintilla.vcxproj b/build/scintilla/scintilla.vcxproj
index 595026a2c..70c1b6e27 100644
--- a/build/scintilla/scintilla.vcxproj
+++ b/build/scintilla/scintilla.vcxproj
@@ -74,10 +74,13 @@
     <ClCompile Include="$(SrcDir)\src\ContractionState.cxx" />
     <ClCompile Include="$(SrcDir)\src\Decoration.cxx" />
     <ClCompile Include="$(SrcDir)\src\Document.cxx" />
+    <ClCompile Include="$(SrcDir)\src\EditModel.cxx" />
+    <ClCompile Include="$(SrcDir)\src\EditView.cxx" />
     <ClCompile Include="$(SrcDir)\src\Editor.cxx" />
     <ClCompile Include="$(SrcDir)\src\Indicator.cxx" />
     <ClCompile Include="$(SrcDir)\src\KeyMap.cxx" />
     <ClCompile Include="$(SrcDir)\src\LineMarker.cxx" />
+    <ClCompile Include="$(SrcDir)\src\MarginView.cxx" />
     <ClCompile Include="$(SrcDir)\src\PerLine.cxx" />
     <ClCompile Include="$(SrcDir)\src\PositionCache.cxx" />
     <ClCompile Include="$(SrcDir)\src\RESearch.cxx" />
diff --git a/build/wx/setup-build.h b/build/wx/setup-build.h
index 03228ae16..caf5b8fbd 100644
--- a/build/wx/setup-build.h
+++ b/build/wx/setup-build.h
@@ -98,7 +98,7 @@
 #define wxUSE_CHECKBOX 1
 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE 1
-#define wxUSE_COLLPANE 1
+#define wxUSE_COLLPANE 0
 #define wxUSE_COLOURPICKERCTRL 1
 #define wxUSE_COMBOBOX 1
 #define wxUSE_DATAVIEWCTRL 1
@@ -258,4 +258,5 @@
 #define wxUSE_TASKBARBUTTON 0
 #define wxUSE_ADDREMOVECTRL 0
 #define wxUSE_ACTIVITYINDICATOR 0
+#define wxUSE_WINRT 0
 #endif
diff --git a/build/wx/wxWidgets.vcxproj b/build/wx/wxWidgets.vcxproj
index 4a441b27b..4567381ed 100644
--- a/build/wx/wxWidgets.vcxproj
+++ b/build/wx/wxWidgets.vcxproj
@@ -369,6 +369,7 @@
     <ClCompile Include="$(SrcDir)src\msw\stattext.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\statusbar.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\stdpaths.cpp" />
+    <ClCompile Include="$(SrcDir)src\msw\systhemectrl.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\textctrl.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\textentry.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\textmeasure.cpp" />
diff --git a/vendor/wxWidgets b/vendor/wxWidgets
index a80aaf4c9..d08c66fcb 160000
--- a/vendor/wxWidgets
+++ b/vendor/wxWidgets
@@ -1 +1 @@
-Subproject commit a80aaf4c9c85d2db6d4b698c0cfcb9db90548762
+Subproject commit d08c66fcb46dea7d61e4a3565cd09fb4c675a201