diff --git a/Build/Build.bat b/Build/Build.bat
deleted file mode 100644
index a512ebea5..000000000
--- a/Build/Build.bat
+++ /dev/null
@@ -1,169 +0,0 @@
-@ECHO OFF
-rem ****************************************************************************
-rem * *
-rem * Notepad3 *
-rem * *
-rem * Build.bat *
-rem * Batch file used to build Notepad3 *
-rem * Originally taken and adapted from Notepad2-mod: *
-rem * http://xhmikosr.github.io/notepad2-mod/ *
-rem * *
-rem * *
-rem * (c) Rizonesoft 2008-2016 *
-rem * https://rizonesoft.com *
-rem * *
-rem * *
-rem ****************************************************************************
-
-SETLOCAL ENABLEEXTENSIONS
-CD /D %~dp0
-
-rem Check the building environment
-IF NOT DEFINED VS140COMNTOOLS CALL :SUBMSG "ERROR" "Visual Studio 2015 wasn't found!"
-
-rem Check for the help switches
-IF /I "%~1" == "help" GOTO SHOWHELP
-IF /I "%~1" == "/help" GOTO SHOWHELP
-IF /I "%~1" == "-help" GOTO SHOWHELP
-IF /I "%~1" == "--help" GOTO SHOWHELP
-IF /I "%~1" == "/?" GOTO SHOWHELP
-
-rem Check for the first switch
-IF "%~1" == "" (
- SET "BUILDTYPE=Build"
-) ELSE (
- IF /I "%~1" == "Build" SET "BUILDTYPE=Build" & GOTO CHECKSECONDARG
- IF /I "%~1" == "/Build" SET "BUILDTYPE=Build" & GOTO CHECKSECONDARG
- IF /I "%~1" == "-Build" SET "BUILDTYPE=Build" & GOTO CHECKSECONDARG
- IF /I "%~1" == "--Build" SET "BUILDTYPE=Build" & GOTO CHECKSECONDARG
- IF /I "%~1" == "Clean" SET "BUILDTYPE=Clean" & GOTO CHECKSECONDARG
- IF /I "%~1" == "/Clean" SET "BUILDTYPE=Clean" & GOTO CHECKSECONDARG
- IF /I "%~1" == "-Clean" SET "BUILDTYPE=Clean" & GOTO CHECKSECONDARG
- IF /I "%~1" == "--Clean" SET "BUILDTYPE=Clean" & GOTO CHECKSECONDARG
- IF /I "%~1" == "Rebuild" SET "BUILDTYPE=Rebuild" & GOTO CHECKSECONDARG
- IF /I "%~1" == "/Rebuild" SET "BUILDTYPE=Rebuild" & GOTO CHECKSECONDARG
- IF /I "%~1" == "-Rebuild" SET "BUILDTYPE=Rebuild" & GOTO CHECKSECONDARG
- IF /I "%~1" == "--Rebuild" SET "BUILDTYPE=Rebuild" & GOTO CHECKSECONDARG
-
- ECHO.
- ECHO Unsupported commandline switch!
- ECHO Run "%~nx0 help" for details about the commandline switches.
- CALL :SUBMSG "ERROR" "Compilation failed!"
-)
-
-
-:CHECKSECONDARG
-rem Check for the second switch
-IF "%~2" == "" (
- SET "ARCH=all"
-) ELSE (
- IF /I "%~2" == "x86" SET "ARCH=x86" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "/x86" SET "ARCH=x86" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "-x86" SET "ARCH=x86" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "--x86" SET "ARCH=x86" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "x64" SET "ARCH=x64" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "/x64" SET "ARCH=x64" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "-x64" SET "ARCH=x64" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "--x64" SET "ARCH=x64" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "all" SET "ARCH=all" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "/all" SET "ARCH=all" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "-all" SET "ARCH=all" & GOTO CHECKTHIRDARG
- IF /I "%~2" == "--all" SET "ARCH=all" & GOTO CHECKTHIRDARG
-
- ECHO.
- ECHO Unsupported commandline switch!
- ECHO Run "%~nx0 help" for details about the commandline switches.
- CALL :SUBMSG "ERROR" "Compilation failed!"
-)
-
-
-:CHECKTHIRDARG
-rem Check for the third switch
-IF "%~3" == "" (
- SET "CONFIG=Release"
-) ELSE (
- IF /I "%~3" == "Debug" SET "CONFIG=Debug" & GOTO START
- IF /I "%~3" == "/Debug" SET "CONFIG=Debug" & GOTO START
- IF /I "%~3" == "-Debug" SET "CONFIG=Debug" & GOTO START
- IF /I "%~3" == "--Debug" SET "CONFIG=Debug" & GOTO START
- IF /I "%~3" == "Release" SET "CONFIG=Release" & GOTO START
- IF /I "%~3" == "/Release" SET "CONFIG=Release" & GOTO START
- IF /I "%~3" == "-Release" SET "CONFIG=Release" & GOTO START
- IF /I "%~3" == "--Release" SET "CONFIG=Release" & GOTO START
- IF /I "%~3" == "all" SET "CONFIG=all" & GOTO START
- IF /I "%~3" == "/all" SET "CONFIG=all" & GOTO START
- IF /I "%~3" == "-all" SET "CONFIG=all" & GOTO START
- IF /I "%~3" == "--all" SET "CONFIG=all" & GOTO START
-
- ECHO.
- ECHO Unsupported commandline switch!
- ECHO Run "%~nx0 help" for details about the commandline switches.
- CALL :SUBMSG "ERROR" "Compilation failed!"
-)
-
-
-:START
-IF /I "%ARCH%" == "x64" GOTO x64
-IF /I "%ARCH%" == "x86" GOTO x86
-
-
-:x86
-CALL "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86
-
-IF /I "%CONFIG%" == "all" (CALL :SUBMSVC %BUILDTYPE% Debug Win32 && CALL :SUBMSVC %BUILDTYPE% Release Win32) ELSE (CALL :SUBMSVC %BUILDTYPE% %CONFIG% Win32)
-
-IF /I "%ARCH%" == "x86" GOTO END
-
-
-:x64
-CALL "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
-
-IF /I "%CONFIG%" == "all" (CALL :SUBMSVC %BUILDTYPE% Debug x64 && CALL :SUBMSVC %BUILDTYPE% Release x64) ELSE (CALL :SUBMSVC %BUILDTYPE% %CONFIG% x64)
-
-
-:END
-TITLE Building Notepad3 Finished!
-ENDLOCAL
-EXIT /B
-
-
-:SUBMSVC
-ECHO.
-TITLE Building Notepad3 - %~1 "%~2|%~3"...
-"MSBuild.exe" /nologo ..\Notepad3.sln /t:%~1 /p:Configuration=%~2;Platform=%~3^
- /consoleloggerparameters:Verbosity=minimal /maxcpucount /nodeReuse:true
-IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
-EXIT /B
-
-
-:SHOWHELP
-TITLE %~nx0 %1
-ECHO. & ECHO.
-ECHO Usage: %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|all] [Debug^|Release^|all]
-ECHO.
-ECHO Notes: You can also prefix the commands with "-", "--" or "/".
-ECHO The arguments are not case sensitive.
-ECHO. & ECHO.
-ECHO Executing %~nx0 without any arguments is equivalent to "%~nx0 build all release"
-ECHO.
-ECHO If you skip the second argument the default one will be used.
-ECHO The same goes for the third argument. Examples:
-ECHO "%~nx0 rebuild" is the same as "%~nx0 rebuild all release"
-ECHO "%~nx0 rebuild x86" is the same as "%~nx0 rebuild x86 release"
-ECHO.
-ECHO WARNING: "%~nx0 x86" or "%~nx0 debug" won't work.
-ECHO.
-ENDLOCAL
-EXIT /B
-
-
-:SUBMSG
-ECHO. & ECHO ______________________________
-ECHO [%~1] %~2
-ECHO ______________________________ & ECHO.
-IF /I "%~1" == "ERROR" (
- PAUSE
- EXIT
-) ELSE (
- EXIT /B
-)
diff --git a/Build/make_all.bat b/Build/make_all.bat
deleted file mode 100644
index ef28d8542..000000000
--- a/Build/make_all.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@ECHO OFF
-rem ****************************************************************************
-rem * *
-rem * Notepad3 *
-rem * *
-rem * make_all.bat *
-rem * Batch file for building Notepad3 *
-rem * and creating the installer/zip packages. *
-rem * Originally taken and adapted from Notepad2-mod: *
-rem * http://xhmikosr.github.io/notepad2-mod/ *
-rem * *
-rem * *
-rem * (c) Rizonesoft 2008-2016 *
-rem * https://rizonesoft.com *
-rem * *
-rem * *
-rem ****************************************************************************
-
-SETLOCAL
-CD /D %~dp0
-
-CALL "Build.bat"
-CALL "upx.bat"
-CALL "sign.bat"
-CALL "make_zip.bat"
-CALL "make_installer.bat"
-
-:END
-TITLE Finished!
-ECHO.
-PAUSE
-ENDLOCAL
-EXIT /B
\ No newline at end of file
diff --git a/Build/make_zip.bat b/Build/make_zip.bat
index b378b2e33..82f826fec 100644
--- a/Build/make_zip.bat
+++ b/Build/make_zip.bat
@@ -85,9 +85,10 @@ IF EXIST "%TEMP_NAME%" RD /S /Q "%TEMP_NAME%"
IF NOT EXIST "%TEMP_NAME%" MD "%TEMP_NAME%"
IF NOT EXIST "packages" MD "packages"
-FOR %%A IN ("..\License.txt" "..\%1\Notepad3.exe"^
+FOR %%A IN ("..\%1\Notepad3.exe"^
"..\distrib\Notepad3.ini" "..\distrib\Readme.txt"^
- "..\%1\minipath.exe" "..\%1\np3encrypt.exe"
+ "..\distrib\Changes.txt" "..\distrib\License.txt"^
+ "..\%1\minipath.exe" "..\%1\np3encrypt.exe" "
) DO COPY /Y /V "%%A" "%TEMP_NAME%\"
SET "FAVORITES=%TEMP_NAME%\Favorites"
@@ -96,7 +97,7 @@ IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"
PUSHD "%TEMP_NAME%"
"%SEVENZIP%" a -tzip -mx=9^
- "%ZIP_NAME%.zip" "License.txt" "Notepad3.exe"^
+ "%ZIP_NAME%.zip" "License.txt" "Notepad3.exe" "Changes.txt"^
"Notepad3.ini" "Readme.txt" "Favorites" "minipath.exe" "np3encrypt.exe">NUL
IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
diff --git a/Build/upx.bat b/Build/upx.bat
index 559b62e3b..422234230 100644
--- a/Build/upx.bat
+++ b/Build/upx.bat
@@ -23,17 +23,17 @@ IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notep
IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!"
ECHO.
ECHO.
-Bin\UPX --brute "..\%INPUTDIRx86%\Notepad3.exe"
+Bin\UPX --best "..\%INPUTDIRx86%\Notepad3.exe"
ECHO.
-Bin\UPX --brute "..\%INPUTDIRx86%\minipath.exe"
+Bin\UPX --best "..\%INPUTDIRx86%\minipath.exe"
ECHO.
-Bin\UPX --brute "..\%INPUTDIRx86%\np3encrypt.exe"
+Bin\UPX --best "..\%INPUTDIRx86%\np3encrypt.exe"
ECHO.
-Bin\UPX --brute "..\%INPUTDIRx64%\Notepad3.exe"
+Bin\UPX --best "..\%INPUTDIRx64%\Notepad3.exe"
ECHO.
-Bin\UPX --brute "..\%INPUTDIRx64%\minipath.exe"
+Bin\UPX --best "..\%INPUTDIRx64%\minipath.exe"
ECHO.
-Bin\UPX --brute "..\%INPUTDIRx64%\np3encrypt.exe"
+Bin\UPX --best "..\%INPUTDIRx64%\np3encrypt.exe"
ECHO.
ECHO.
diff --git a/Versions/build.txt b/Versions/build.txt
index 1e308d8d6..a20e4d18a 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-696
+715
diff --git a/distrib/notepad3_setup.iss b/distrib/Backup/notepad3_setup.iss
similarity index 100%
rename from distrib/notepad3_setup.iss
rename to distrib/Backup/notepad3_setup.iss
diff --git a/distrib/Changes.txt b/distrib/Changes.txt
index 9549ac268..5cc9d67ca 100644
--- a/distrib/Changes.txt
+++ b/distrib/Changes.txt
@@ -2,6 +2,23 @@
Rizonesoft Notepad3 CHANGES
==================================================
+--------------------------------------------------
+Version 3.17.1202.715 (2 December 2017)
+--------------------------------------------------
+- #191 Revert to Scintilla's old (default) font rendering technology. Modern DirectWrite available at [Settings2] SciDirectWriteTech=1
+- Fix: Removed unused mouse wheel message interception.
+- Fix: Disabling buffered draw. (Scintilla: "Current platforms perform window buffering so it is almost always better for this option to be turned off.")
+- Fix: Font Smoothing: [Settings2] SciFontQuality=n has no effect on some special fonts (preserving old behavior if not defined).
+- Workaround: #192 Drag n' drop from 32-bit process on Notepad3 x64 window
+- Renaming of drag n' drop methods.
+- Fix: Adapt text for messagebox: no valid drop-file.
+- Fix: issue regarding Accelerator keys for find/replace dialog.
+- Feature: Additionally show full path to current directory in windows title.
+- Fix: Minipath full path display in titlebar (no dbl-slash in case of drive letter only).
+- Fix: Mark occurrences: Outline frame of indicator box shouls have same aplpha channel color (configurable alpha2:nnn).
+- Change request: move "Mark Occurrences" check box from menu to find/replace dialog options.
+- Fix: Find/replace dialog: mark occurrences: use standard save/restore settings behavior.
+
--------------------------------------------------
Version 3.17.1124.690 (24 November 2017)
--------------------------------------------------
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 2fcba3fed..d7b6eacaa 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 614ec5017..44cefe6fc 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -1,5 +1,5 @@
#define VERSION_MAJOR 3
#define VERSION_MINOR 17
-#define VERSION_REV 1125
-#define VERSION_BUILD 696
+#define VERSION_REV 1202
+#define VERSION_BUILD 715
#define SCINTILLA_VER 402