diff --git a/Version.ps1 b/Version.ps1
index 6ee9474a9..2b3c92c88 100644
--- a/Version.ps1
+++ b/Version.ps1
@@ -49,9 +49,9 @@ try
 	if (!$OnigmoVer) { $OnigmoVer = "0.0.0" }
 	
 	$CompleteVer = "$Major.$Minor.$Revis.$Build"
-	DebugOutput("Version number: '$VerPatch v$CompleteVer'")
+	DebugOutput("Version number: 'v$CompleteVer $VerPatch'")
 
-if ($VerPatch) { $VerPatch = " $VerPatch" }  # ensure space in front of string
+#~if ($VerPatch) { $VerPatch = " $VerPatch" }  # ensure space in front of string
 
 	Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$APPNAME\$', "$AppName" } | Set-Content "src\VersionEx.h"
diff --git a/Version_RC.cmd b/Version_RC.cmd
index ac0908092..67dfcbeac 100644
--- a/Version_RC.cmd
+++ b/Version_RC.cmd
@@ -1,6 +1,6 @@
 @echo off
 setlocal
 set _VERPATCH_=RC
-echo.%_VERPATCH_%> .\np3portableapp\_buildname.txt
+echo."%_VERPATCH_%" > .\np3portableapp\_buildname.txt
 Version -VerPatch "%_VERPATCH_%"
 endlocal
diff --git a/Version_develop.cmd b/Version_develop.cmd
index 8a8705963..d7dd899cb 100644
--- a/Version_develop.cmd
+++ b/Version_develop.cmd
@@ -1,6 +1,6 @@
 @echo off
 setlocal
 set _VERPATCH_=develop
-echo.%_VERPATCH_%> .\np3portableapp\_buildname.txt
+echo."%_VERPATCH_%" > .\np3portableapp\_buildname.txt
 Version -VerPatch "%_VERPATCH_%"
 endlocal
diff --git a/Versions/build.txt b/Versions/build.txt
index a2f103a07..68abbd9ad 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1434
+1440
diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini
index d26d84804..8a0e9daff 100644
--- a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini
@@ -5,28 +5,40 @@ Version=3.5
 
 [Details]
 Name=Notepad3PortablexxxDEVNAMExxx
-AppId=Notepad3PortablexxxDEVNAMExxx
+AppId=Notepad3Portable
+BaseAppName=Notepad3
 Publisher=Notepad3 Contibutors & Rizonesoft & PortableApps.com
-Homepage=https://rizonesoft.com
+Homepage=PortableApps.com/Notepad3Portable
 Category=Development
 Description=A lightweight universal Texteditor
-Language=English
+Language=Multilingual
+;Trademarks='thing' is a trademark of XYZ Inc
+;InstallType=
 
 [License]
 Shareable=true
 OpenSource=true
 Freeware=true
 CommercialUse=true
-
-[Dependencies]
+;EULAVersion=1
 
 [Version]
 PackageVersion=xxxVERSIONxxx
-DisplayVersion=xxxVERSIONxxx
+DisplayVersion=xxxVERSIONxxx_xxxDEVNAMExxx
+
+[SpecialPaths]
+Plugins=NONE
+
+[Dependencies]
+UsesJava=no
+;UsesDotNetVersion=
 
 [Control]
 Icons=1
 Start=Notepad3Portable.exe
+;ExtractIcon=App\Notepad3\x86\Notepad3.exe
+;ExtractName=App\Notepad3\x86\Notepad3.exe
+;BaseAppID=%BASELAUNCHERPATH%\App\Notepad3\x86\Notepad3.exe
 
 [Associations]
 FileTypes=txt,html,htm,xmp,php,asp,css,js,vb,vbs,c,cpp,h,rs,mak,java,pas,inc,bat,diff,ps1,ahk,au3,avs,cmake,iss,latex,lua,nsi,nsh,nfo,tcl,rb
@@ -40,4 +52,7 @@ FileTypes=txt,html,htm,xmp,php,asp,css,js,vb,vbs,c,cpp,h,rs,mak,java,pas,inc,bat
 ;Shell=true
 ;ShellCommand=/idlist,%I,%L
 
-;[FileTypeIcons]
+[FileTypeIcons]
+;swf=video
+;ttp=custom
+;qwe=app
diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
index 215831c9a..7e6ea7652 100644
--- a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
@@ -1,20 +1,24 @@
 [CheckRunning]
 [Source]
+IncludeInstallerSource=false
 [MainDirectories]
+RemoveAppDirectory=true
+RemoveDataDirectory=false
+RemoveOtherDirectory=true
 [OptionalComponents]
 [CopyLocalFiles]
 [DownloadFiles]
 [Languages]
 ENGLISH=true
-AFRIKAANS=true
-DUTCH=true
 ENGLISHGB=true
+AFRIKAANS=true
+BELARUSIAN=true
+DUTCH=true
 FRENCH=true
 GERMAN=true
 JAPANESE=true
 RUSSIAN=true
 SIMPCHINESE=true
-SPANISH=true
 [DirectoriesToPreserve]
 [DirectoriesToRemove]
 [FilesToPreserve]
diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini
index cf2481985..1055e81db 100644
--- a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini
@@ -12,14 +12,15 @@
 ;CloseName=AppName
 
 [Source]
-;IncludeInstallerSource=false
+IncludeInstallerSource=false
 
 [MainDirectories]
-;RemoveAppDirectory=true
-;RemoveOtherDirectory=true
+RemoveAppDirectory=true
+RemoveDataDirectory=false
+RemoveOtherDirectory=true
 
 [OptionalComponents]
-;OptionalComponents=true
+;OptionalComponents=false
 ;MainSectionTitle=AppName Portable (English) [Required]
 ;MainSectionDescription=Install the portable app
 ;OptionalSectionTitle=Additional Languages
diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt
index 4c35976dc..ec9870689 100644
--- a/np3portableapp/_buildname.txt
+++ b/np3portableapp/_buildname.txt
@@ -1 +1 @@
-RC
+"Dev_Test_1" 
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index 7bbdf4eb7..02dd1f6d8 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -115,7 +115,7 @@ call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP
 :: DEVNAME need some more PortableApps preparation
 ::~  call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INFO%_tmp.ini" "_%DEVNAME%" "%NP3_PORTAPP_INFO%.ini"
 ::~  call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INSTALL%_template.ini" "_%DEVNAME%" "%NP3_PORTAPP_INSTALL%.ini"
-call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INFO%_tmp.ini" "" "%NP3_PORTAPP_INFO%.ini"
+call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INFO%_tmp.ini" "%DEVNAME%" "%NP3_PORTAPP_INFO%.ini"
 call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INSTALL%_template.ini" "" "%NP3_PORTAPP_INSTALL%.ini"
 
 del /F "%NP3_PORTAPP_INFO%_tmp.ini"
@@ -134,7 +134,7 @@ del /F "%NP3_PORTAPP_INFO%_tmp.ini"
 "%PORTAPP_INSTALLER_CREATOR%" "%NP3_PORTAPP_DIR%"
 
 :: rename
-rename "%SCRIPT_DIR%Notepad3Portable_%VERSION%_English.paf.exe" "Notepad3Portable_%DEVNAME%_%VERSION%_English.paf.exe"
+rename "%SCRIPT_DIR%Notepad3Portable_%VERSION%.paf.exe" "Notepad3Portable_%VERSION%_%DEVNAME%.paf.exe"
 
 :: ====================================================================================================================
 goto :END
@@ -182,6 +182,7 @@ goto:EOF
 set /p nxbuild=<%NP3_BUILD_VER%
 set /a BUILD = %nxbuild% - 1
 set /p DEVNAME=<%NP3_BUILD_NAME%
+set DEVNAME=%DEVNAME:"=%
 goto:EOF
 :: --------------------------------------------------------------------------------------------------------------------
 
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 35fa20e70..9a7fbd966 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.18.1106.1434"
+    version="5.18.1108.1440"
     type="win32"
   />
-  <description>Notepad3  RC</description>
+  <description>Notepad3 Dev_Test_1</description>
 </assembly>
diff --git a/src/Notepad3.c b/src/Notepad3.c
index a28c31b67..da655d030 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -6816,7 +6816,7 @@ void LoadSettings()
     GET_BOOL_VALUE_FROM_INISECTION(BackspaceUnindents, false);
     GET_INT_VALUE_FROM_INISECTION(TabWidth, 4, 1, 1024);  Globals.iTabWidth = Settings.TabWidth;
     GET_INT_VALUE_FROM_INISECTION(IndentWidth, 4, 0, 1024);  Globals.iIndentWidth = Settings.IndentWidth;
-    GET_BOOL_VALUE_FROM_INISECTION(WarnInconsistentIndents, true);
+    GET_BOOL_VALUE_FROM_INISECTION(WarnInconsistentIndents, false);
     GET_BOOL_VALUE_FROM_INISECTION(MarkLongLines, true);
     GET_INT_VALUE_FROM_INISECTION(LongLinesLimit, 80, 0, LONG_LINES_MARKER_LIMIT);  Globals.iLongLinesLimit = Settings.LongLinesLimit;
     GET_INT_VALUE_FROM_INISECTION(LongLineMode, EDGE_LINE, EDGE_LINE, EDGE_BACKGROUND);
diff --git a/src/Version.h b/src/Version.h
index c45e1b97a..afc4cc706 100644
Binary files a/src/Version.h and b/src/Version.h differ
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 8a609b881..d052907ae 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -6,8 +6,8 @@
 #define APPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 18
-#define VERSION_REV 1106
-#define VERSION_BUILD 1434
+#define VERSION_REV 1108
+#define VERSION_BUILD 1440
 #define SCINTILLA_VER 412
 #define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH " RC"
+#define VERSION_PATCH "Dev_Test_1"