diff --git a/Version.ini b/Version.ini
index b7be42a0a..451ac9904 100644
--- a/Version.ini
+++ b/Version.ini
@@ -3,7 +3,7 @@
 ; Minor
 ; Maintenance: 0 - prototype, 1 - beta, 2 - release candidate, 3 - final release
 ; Build number auto increments.
-Version=1.0.2.342
+Version=1.0.2.346
 
 [Templates]
 Versions\VersionEx.h.tpl = src\VersionEx.h
diff --git a/minipath/Version.ini b/minipath/Version.ini
index 431236dea..d6ff922c7 100644
--- a/minipath/Version.ini
+++ b/minipath/Version.ini
@@ -3,7 +3,7 @@
 ; Minor
 ; Maintenance: 0 - prototype, 1 - beta, 2 - release candidate, 3 - final release
 ; Build number auto increments.
-Version=1.0.2.117
+Version=1.0.2.121
 
 [Templates]
 Versions\VersionEx.h.tpl = src\VersionEx.h
diff --git a/minipath/res/Notepad3.exe.manifest.conf b/minipath/res/Notepad3.exe.manifest.conf
index 4ce30d262..11a19572a 100644
--- a/minipath/res/Notepad3.exe.manifest.conf
+++ b/minipath/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
     <assemblyIdentity
         name="MiniPath"
         processorArchitecture="*"
-        version="1.0.2.117"
+        version="1.0.2.121"
         type="win32"
      />
     <description>metapath</description>
diff --git a/minipath/src/VersionEx.h b/minipath/src/VersionEx.h
index 1d4d13c37..ab5cb2650 100644
--- a/minipath/src/VersionEx.h
+++ b/minipath/src/VersionEx.h
@@ -1,4 +1,4 @@
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 #define VERSION_REV 2
-#define VERSION_BUILD 117
+#define VERSION_BUILD 121
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index e8f91fabd..4920308d1 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="1.0.2.342"
+    version="1.0.2.346"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj
index 5f0ee83e2..b7b8474fc 100644
--- a/scintilla/Scintilla.vcxproj
+++ b/scintilla/Scintilla.vcxproj
@@ -85,7 +85,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
@@ -93,7 +93,7 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
@@ -101,7 +101,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
@@ -109,7 +109,7 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
diff --git a/src/Version.h b/src/Version.h
index d340b52fb..1499421ca 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -66,18 +66,18 @@
 #elif defined(_MSC_VER)
     #if _MSC_VER == 1900
         #if (_MSC_FULL_VER == 190024213)
-            #define VERSION_COMPILER    L"MSVC 2015 Update 3"
+            #define VERSION_COMPILER    L"Microsoft Visual C++ 2015 Update 3"
         #elif (_MSC_FULL_VER == 190023918)
-            #define VERSION_COMPILER    L"MSVC 2015 Update 2"
+            #define VERSION_COMPILER    L"Microsoft Visual C++ 2015 Update 2"
         #elif (_MSC_FULL_VER == 190023506)
-            #define VERSION_COMPILER    L"MSVC 2015 Update 1"
+            #define VERSION_COMPILER    L"Microsoft Visual C++ 2015 Update 1"
         #elif (_MSC_FULL_VER == 190023026)
-            #define VERSION_COMPILER    L"MSVC 2015"
+            #define VERSION_COMPILER    L"Microsoft Visual C++ 2015"
         #else
-            #define VERSION_COMPILER    L"MSVC 2015"
+            #define VERSION_COMPILER    L"Microsoft Visual C++ 2015"
         #endif
     #else
-        #define VERSION_COMPILER        L"MSVC (version unknown)"
+        #define VERSION_COMPILER        L"Microsoft Visual C++ (version unknown)"
     #endif
 #else
     #define VERSION_COMPILER            L"(Unknown compiler)"
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 14d208eca..ff88ce456 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -1,4 +1,4 @@
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 #define VERSION_REV 2
-#define VERSION_BUILD 342
+#define VERSION_BUILD 346