diff --git a/src/win/msvc/vc15/VARCem.vcxproj b/src/win/msvc/vc15/VARCem.vcxproj
index aa97c77..1e2eee9 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj
+++ b/src/win/msvc/vc15/VARCem.vcxproj
@@ -252,6 +252,9 @@
     <ClCompile Include="..\..\..\sound\sound.c" />
     <ClCompile Include="..\..\..\sound\sound_dev.c" />
     <ClCompile Include="..\..\..\timer.c" />
+    <ClCompile Include="..\..\..\ui\ui_main.c" />
+    <ClCompile Include="..\..\..\ui\ui_new_floppy.c" />
+    <ClCompile Include="..\..\..\ui\ui_stbar.c" />
     <ClCompile Include="..\..\..\video\video.c" />
     <ClCompile Include="..\..\..\video\video_dev.c" />
     <ClCompile Include="..\..\..\video\vid_ati18800.c" />
@@ -311,7 +314,6 @@
     <ClCompile Include="..\..\..\win\win_settings.c" />
     <ClCompile Include="..\..\..\win\win_snd_gain.c" />
     <ClCompile Include="..\..\..\win\win_status.c" />
-    <ClCompile Include="..\..\..\win\win_stbar.c" />
     <ClCompile Include="..\..\..\win\win_thread.c" />
     <ClCompile Include="..\..\..\win\win_ui.c" />
   </ItemGroup>
@@ -421,7 +423,6 @@
     <ClInclude Include="..\..\..\intel_piix.h" />
     <ClInclude Include="..\..\..\intel_sio.h" />
     <ClInclude Include="..\..\..\io.h" />
-    <ClInclude Include="..\..\..\lang\language.h" />
     <ClInclude Include="..\..\..\machine\machine.h" />
     <ClInclude Include="..\..\..\machine\m_at_t3100e.h" />
     <ClInclude Include="..\..\..\machine\m_xt_t1000.h" />
@@ -433,8 +434,6 @@
     <ClInclude Include="..\..\..\network\network.h" />
     <ClInclude Include="..\..\..\network\net_ne2000.h" />
     <ClInclude Include="..\..\..\network\slirp\bootp.h" />
-    <ClInclude Include="..\..\..\network\slirp\config-host.h" />
-    <ClInclude Include="..\..\..\network\slirp\config.h" />
     <ClInclude Include="..\..\..\network\slirp\ctl.h" />
     <ClInclude Include="..\..\..\network\slirp\debug.h" />
     <ClInclude Include="..\..\..\network\slirp\icmp_var.h" />
@@ -541,7 +540,8 @@
     <ClInclude Include="..\..\..\sound\snd_speaker.h" />
     <ClInclude Include="..\..\..\sound\snd_ym7128.h" />
     <ClInclude Include="..\..\..\timer.h" />
-    <ClInclude Include="..\..\..\ui.h" />
+    <ClInclude Include="..\..\..\ui\ui.h" />
+    <ClInclude Include="..\..\..\ui\ui_resource.h" />
     <ClInclude Include="..\..\..\version.h" />
     <ClInclude Include="..\..\..\video\video.h" />
     <ClInclude Include="..\..\..\video\vid_ati68860_ramdac.h" />
@@ -576,7 +576,7 @@
     <ProjectGuid>{6E445F28-CA8F-430F-8CCF-C59C53516AC5}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>VARCem</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -652,7 +652,6 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -671,7 +670,6 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -691,7 +689,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -714,7 +711,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/src/win/msvc/vc15/VARCem.vcxproj.filters b/src/win/msvc/vc15/VARCem.vcxproj.filters
index 01a2522..ed0be73 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj.filters
+++ b/src/win/msvc/vc15/VARCem.vcxproj.filters
@@ -709,9 +709,6 @@
     <ClCompile Include="..\..\..\win\win_status.c">
       <Filter>win</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\win\win_stbar.c">
-      <Filter>win</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\win\win_thread.c">
       <Filter>win</Filter>
     </ClCompile>
@@ -828,6 +825,15 @@
     <ClCompile Include="..\..\..\ports\serial.c">
       <Filter>ports</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\ui\ui_main.c">
+      <Filter>ui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ui\ui_new_floppy.c">
+      <Filter>ui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ui\ui_stbar.c">
+      <Filter>ui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\bugger.h" />
@@ -847,8 +853,6 @@
     <ClInclude Include="..\..\..\nmi.h" />
     <ClInclude Include="..\..\..\nvr.h" />
     <ClInclude Include="..\..\..\nvr_ps2.h" />
-    <ClInclude Include="..\..\..\parallel.h" />
-    <ClInclude Include="..\..\..\parallel_dev.h" />
     <ClInclude Include="..\..\..\pci.h" />
     <ClInclude Include="..\..\..\pic.h" />
     <ClInclude Include="..\..\..\pit.h" />
@@ -857,7 +861,6 @@
     <ClInclude Include="..\..\..\random.h" />
     <ClInclude Include="..\..\..\rom.h" />
     <ClInclude Include="..\..\..\timer.h" />
-    <ClInclude Include="..\..\..\ui.h" />
     <ClInclude Include="..\..\..\cdrom\cdrom.h">
       <Filter>cdrom</Filter>
     </ClInclude>
@@ -1119,9 +1122,6 @@
     <ClInclude Include="..\..\..\floppy\fdi2raw.h">
       <Filter>floppy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\lang\language.h">
-      <Filter>lang</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\machine\m_at_t3100e.h">
       <Filter>machine</Filter>
     </ClInclude>
@@ -1131,12 +1131,6 @@
     <ClInclude Include="..\..\..\network\slirp\bootp.h">
       <Filter>network\slirp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\network\slirp\config.h">
-      <Filter>network\slirp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\network\slirp\config-host.h">
-      <Filter>network\slirp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\network\slirp\ctl.h">
       <Filter>network\slirp</Filter>
     </ClInclude>
@@ -1531,6 +1525,12 @@
     <ClInclude Include="..\..\..\ports\serial.h">
       <Filter>ports</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\ui\ui.h">
+      <Filter>ui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ui\ui_resource.h">
+      <Filter>ui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cdrom">
@@ -1548,9 +1548,6 @@
     <Filter Include="floppy">
       <UniqueIdentifier>{a9a86e4f-b4eb-4687-a979-f97b394db706}</UniqueIdentifier>
     </Filter>
-    <Filter Include="lang">
-      <UniqueIdentifier>{232b8441-5106-47b6-939d-ebd46589c0b2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="machine">
       <UniqueIdentifier>{a99de26d-e4fd-4223-952c-21f1657a20e7}</UniqueIdentifier>
     </Filter>
@@ -1599,6 +1596,9 @@
     <Filter Include="ports">
       <UniqueIdentifier>{b9d0388f-b14d-4448-85fe-7179fff3f77f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ui">
+      <UniqueIdentifier>{7cec753e-1e2c-4ebd-ba5b-e728767c949f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\VARCem.rc">