diff --git a/PowerEditor/scintilla.original.forUpdating/lexilla524.zip b/PowerEditor/scintilla.original.forUpdating/lexilla525.zip
similarity index 71%
rename from PowerEditor/scintilla.original.forUpdating/lexilla524.zip
rename to PowerEditor/scintilla.original.forUpdating/lexilla525.zip
index 6328b7117953..eef755e4ed7b 100644
Binary files a/PowerEditor/scintilla.original.forUpdating/lexilla524.zip and b/PowerEditor/scintilla.original.forUpdating/lexilla525.zip differ
diff --git a/PowerEditor/scintilla.original.forUpdating/scintilla534.zip b/PowerEditor/scintilla.original.forUpdating/scintilla535.zip
similarity index 52%
rename from PowerEditor/scintilla.original.forUpdating/scintilla534.zip
rename to PowerEditor/scintilla.original.forUpdating/scintilla535.zip
index 02bfd207cc10..c2a47cb4ceda 100644
Binary files a/PowerEditor/scintilla.original.forUpdating/scintilla534.zip and b/PowerEditor/scintilla.original.forUpdating/scintilla535.zip differ
diff --git a/lexilla/cppcheck.suppress b/lexilla/cppcheck.suppress
index e17438c0cea0..e09a888c3034 100644
--- a/lexilla/cppcheck.suppress
+++ b/lexilla/cppcheck.suppress
@@ -29,7 +29,6 @@ shadowVariable:lexilla/lexers/LexAU3.cxx
 constParameter:lexilla/lexers/LexBaan.cxx
 unreadVariable:lexilla/lexers/LexBaan.cxx
 constParameter:lexilla/lexers/LexBash.cxx
-uninitMemberVar:lexilla/lexers/LexBash.cxx
 variableScope:lexilla/lexers/LexBash.cxx
 variableScope:lexilla/lexers/LexCmake.cxx
 knownConditionTrueFalse:lexilla/lexers/LexCmake.cxx
@@ -46,7 +45,6 @@ variableScope:lexilla/lexers/LexErlang.cxx
 knownConditionTrueFalse:lexilla/lexers/LexEScript.cxx
 constParameter:lexilla/lexers/LexFortran.cxx
 redundantContinue:lexilla/lexers/LexFortran.cxx
-redundantCondition:lexilla/lexers/LexFSharp.cxx
 knownConditionTrueFalse:lexilla/lexers/LexFSharp.cxx
 constParameter:lexilla/lexers/LexGDScript.cxx
 variableScope:lexilla/lexers/LexGui4Cli.cxx
diff --git a/lexilla/doc/Lexilla.html b/lexilla/doc/Lexilla.html
index c5b06db862d4..87d64a0fd95f 100644
--- a/lexilla/doc/Lexilla.html
+++ b/lexilla/doc/Lexilla.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20230313" />
+    <meta name="Date.Modified" content="20230531" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -61,8 +61,8 @@
           <font color="#FFCC99" size="4"> A library of language lexers for use with Scintilla</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3">Release version 5.2.4<br />
-           Site last modified March 13 2023</font>
+          <font color="#FFCC99" size="3">Release version 5.2.5<br />
+           Site last modified May 31 2023</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,13 +77,12 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.2.5 improves Bash, Batch, F#, and VB.</li>
       <li>Version 5.2.4 improves C++ and GDScript.</li>
       <li>Version 5.2.3 improves Makefile, Ruby, and YAML.</li>
       <li>Version 5.2.2 improves C++, Matlab, Modula-3, Python, and X12.</li>
       <li>Version 5.2.1 improves Batch, F#, Markdown, and PowerShell.</li>
       <li>Version 5.2.0 improves PowerShell and R.</li>
-      <li>Version 5.1.9 improves Julia and Properties.</li>
-      <li>Version 5.1.8 improves F#, MS SQL, PowerShell, and Visual Prolog.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/lexilla/doc/LexillaDownload.html b/lexilla/doc/LexillaDownload.html
index f25dad73efc3..8ee1804a69a4 100644
--- a/lexilla/doc/LexillaDownload.html
+++ b/lexilla/doc/LexillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/lexilla524.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla525.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla524.tgz">
+	<a href="https://www.scintilla.org/lexilla525.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.2.4
+       Release 5.2.5
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@ <h4>
        The source code package contains all of the source code for Lexilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/lexilla524.zip">zip format</a> (1.2M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla524.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla525.zip">zip format</a> (1.2M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla525.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/lexilla/doc/LexillaHistory.html b/lexilla/doc/LexillaHistory.html
index 17f1678ace94..7b5f39a6eaef 100644
--- a/lexilla/doc/LexillaHistory.html
+++ b/lexilla/doc/LexillaHistory.html
@@ -585,6 +585,63 @@ <h2>Contributors</h2>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla525.zip">Release 5.2.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 May 2023.
+	</li>
+	<li>
+	Add CharacterSetArray constructor without setBase initial argument for common case
+	where this is setNone and the initialSet argument completely defines the characters.
+	This shortens and clarifies use of CharacterSetArray.
+	</li>
+	<li>
+	Bash: implement highlighting inside quoted elements and here-docs.
+	Controlled with properties lexer.bash.styling.inside.string, lexer.bash.styling.inside.backticks,
+	lexer.bash.styling.inside.parameter, and lexer.bash.styling.inside.heredoc.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/153">Issue #153</a>,
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1033/">Feature #1033</a>.
+	</li>
+	<li>
+	Bash: add property lexer.bash.command.substitution to choose how to style command substitutions.
+	0 &rarr; SCE_SH_BACKTICKS;
+	1 &rarr; surrounding "$(" and ")" as operators and contents styled as bash code;
+	2 &rarr; use distinct styles (base style + 64) for contents.
+	Choice (2) is a provisional feature and details may change before it is finalized.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/153">Issue #153</a>.
+	</li>
+	<li>
+	Bash: fix nesting of parameters (SCE_SH_PARAM) like ${var/$sub/"${rep}}"}.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>.
+	</li>
+	<li>
+	Bash: fix single character special parameters like $? by limiting style.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>.
+	</li>
+	<li>
+	Bash: treat "$$" as special parameter and end scalars before "$".
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>.
+	</li>
+	<li>
+	Bash: treat "&lt;&lt;" in arithmetic contexts as left bitwise shift operator instead of here-doc.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/137">Issue #137</a>.
+	</li>
+	<li>
+	Batch: style SCE_BAT_AFTER_LABEL used for rest of line after label which is not executed.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/148">Issue #148</a>.
+	</li>
+	<li>
+	F#: Lex interpolated verbatim strings as verbatim.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/156">Issue #156</a>.
+	</li>
+	<li>
+	VB: allow multiline strings when lexer.vb.strings.multiline set.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/151">Issue #151</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla524.zip">Release 5.2.4</a>
     </h3>
diff --git a/lexilla/include/LexicalStyles.iface b/lexilla/include/LexicalStyles.iface
index 59df61741ada..ca24673ecb1e 100644
--- a/lexilla/include/LexicalStyles.iface
+++ b/lexilla/include/LexicalStyles.iface
@@ -602,6 +602,7 @@ val SCE_BAT_HIDE=4
 val SCE_BAT_COMMAND=5
 val SCE_BAT_IDENTIFIER=6
 val SCE_BAT_OPERATOR=7
+val SCE_BAT_AFTER_LABEL=8
 # Lexical states for SCLEX_TCMD
 lex TCMD=SCLEX_TCMD SCE_TCMD_
 val SCE_TCMD_DEFAULT=0
diff --git a/lexilla/include/SciLexer.h b/lexilla/include/SciLexer.h
index 9ce594f0f006..eadbf2064d03 100644
--- a/lexilla/include/SciLexer.h
+++ b/lexilla/include/SciLexer.h
@@ -676,6 +676,7 @@
 #define SCE_BAT_COMMAND 5
 #define SCE_BAT_IDENTIFIER 6
 #define SCE_BAT_OPERATOR 7
+#define SCE_BAT_AFTER_LABEL 8
 #define SCE_TCMD_DEFAULT 0
 #define SCE_TCMD_COMMENT 1
 #define SCE_TCMD_WORD 2
diff --git a/lexilla/lexers/LexBash.cxx b/lexilla/lexers/LexBash.cxx
index a071e62493ae..5272b61dac90 100644
--- a/lexilla/lexers/LexBash.cxx
+++ b/lexilla/lexers/LexBash.cxx
@@ -6,11 +6,11 @@
 // Adapted from LexPerl by Kein-Hong Man 2004
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
 
 #include <string>
 #include <string_view>
@@ -35,6 +35,8 @@
 using namespace Scintilla;
 using namespace Lexilla;
 
+namespace {
+
 #define HERE_DELIM_MAX			256
 
 // define this if you want 'invalid octals' to be marked as errors
@@ -50,27 +52,50 @@ using namespace Lexilla;
 #endif
 
 // state constants for parts of a bash command segment
-#define	BASH_CMD_BODY			0
-#define BASH_CMD_START			1
-#define BASH_CMD_WORD			2
-#define BASH_CMD_TEST			3
-#define BASH_CMD_ARITH			4
-#define BASH_CMD_DELIM			5
+enum class CmdState {
+	Body,
+	Start,
+	Word,
+	Test,
+	Arithmetic,
+	Delimiter,
+};
+
+enum class TestExprType {
+	Test,			// test
+	DoubleBracket,	// [[]]
+	SingleBracket,	// []
+};
+
+enum class CommandSubstitution {
+	Backtick,
+	Inside,
+	InsideTrack,
+};
 
 // state constants for nested delimiter pairs, used by
-// SCE_SH_STRING and SCE_SH_BACKTICKS processing
-#define BASH_DELIM_LITERAL		0
-#define BASH_DELIM_STRING		1
-#define BASH_DELIM_CSTRING		2
-#define BASH_DELIM_LSTRING		3
-#define BASH_DELIM_COMMAND		4
-#define BASH_DELIM_BACKTICK		5
+// SCE_SH_STRING, SCE_SH_PARAM and SCE_SH_BACKTICKS processing
+enum class QuoteStyle {
+	Literal,		// ''
+	CString,		// $''
+	String,			// ""
+	LString,		// $""
+	HereDoc,		// here document
+	Backtick,		// ``, $``
+	Parameter,		// ${}
+	Command,		// $()
+	CommandInside,	// $() with styling inside
+	Arithmetic,		// $(()), $[]
+};
 
-#define BASH_DELIM_STACK_MAX	7
+#define BASH_QUOTE_STACK_MAX	7
 
-namespace {
+constexpr int commandSubstitutionFlag = 0x40;
+constexpr int MaskCommand(int state) noexcept {
+	return state & ~commandSubstitutionFlag;
+}
 
-inline int translateBashDigit(int ch) {
+constexpr int translateBashDigit(int ch) noexcept {
 	if (ch >= '0' && ch <= '9') {
 		return ch - '0';
 	} else if (ch >= 'a' && ch <= 'z') {
@@ -85,7 +110,7 @@ inline int translateBashDigit(int ch) {
 	return BASH_BASE_ERROR;
 }
 
-inline int getBashNumberBase(char *s) {
+int getBashNumberBase(char *s) noexcept {
 	int i = 0;
 	int base = 0;
 	while (*s) {
@@ -98,7 +123,7 @@ inline int getBashNumberBase(char *s) {
 	return base;
 }
 
-int opposite(int ch) {
+constexpr int opposite(int ch) noexcept {
 	if (ch == '(') return ')';
 	if (ch == '[') return ']';
 	if (ch == '{') return '}';
@@ -109,7 +134,8 @@ int opposite(int ch) {
 int GlobScan(StyleContext &sc) {
 	// forward scan for zsh globs, disambiguate versus bash arrays
 	// complex expressions may still fail, e.g. unbalanced () '' "" etc
-	int c, sLen = 0;
+	int c = 0;
+	int sLen = 0;
 	int pCount = 0;
 	int hash = 0;
 	while ((c = sc.GetRelativeCharacter(++sLen)) != 0) {
@@ -133,10 +159,10 @@ int GlobScan(StyleContext &sc) {
 }
 
 bool IsCommentLine(Sci_Position line, LexAccessor &styler) {
-	Sci_Position pos = styler.LineStart(line);
-	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	const Sci_Position pos = styler.LineStart(line);
+	const Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
 	for (Sci_Position i = pos; i < eol_pos; i++) {
-		char ch = styler[i];
+		const char ch = styler[i];
 		if (ch == '#')
 			return true;
 		else if (ch != ' ' && ch != '\t')
@@ -146,20 +172,34 @@ bool IsCommentLine(Sci_Position line, LexAccessor &styler) {
 }
 
 struct OptionsBash {
-	bool fold;
-	bool foldComment;
-	bool foldCompact;
+	bool fold = false;
+	bool foldComment = false;
+	bool foldCompact = true;
+	bool stylingInsideString = false;
+	bool stylingInsideBackticks = false;
+	bool stylingInsideParameter = false;
+	bool stylingInsideHeredoc = false;
+	int commandSubstitution = static_cast<int>(CommandSubstitution::Backtick);
 
-	OptionsBash() {
-		fold = false;
-		foldComment = false;
-		foldCompact = true;
+	[[nodiscard]] bool stylingInside(int state) const noexcept {
+		switch (state) {
+		case SCE_SH_STRING:
+			return stylingInsideString;
+		case SCE_SH_BACKTICKS:
+			return stylingInsideBackticks;
+		case SCE_SH_PARAM:
+			return stylingInsideParameter;
+		case SCE_SH_HERE_Q:
+			return stylingInsideHeredoc;
+		default:
+			return false;
+		}
 	}
 };
 
 const char * const bashWordListDesc[] = {
 	"Keywords",
-	0
+	nullptr
 };
 
 struct OptionSetBash : public OptionSet<OptionsBash> {
@@ -170,13 +210,173 @@ struct OptionSetBash : public OptionSet<OptionsBash> {
 
 		DefineProperty("fold.compact", &OptionsBash::foldCompact);
 
+		DefineProperty("lexer.bash.styling.inside.string", &OptionsBash::stylingInsideString,
+			"Set this property to 1 to highlight shell expansions inside string.");
+
+		DefineProperty("lexer.bash.styling.inside.backticks", &OptionsBash::stylingInsideBackticks,
+			"Set this property to 1 to highlight shell expansions inside backticks.");
+
+		DefineProperty("lexer.bash.styling.inside.parameter", &OptionsBash::stylingInsideParameter,
+			"Set this property to 1 to highlight shell expansions inside ${} parameter expansion.");
+
+		DefineProperty("lexer.bash.styling.inside.heredoc", &OptionsBash::stylingInsideHeredoc,
+			"Set this property to 1 to highlight shell expansions inside here document.");
+
+		DefineProperty("lexer.bash.command.substitution", &OptionsBash::commandSubstitution,
+			"Set how to highlight $() command substitution. "
+			"0 (the default) highlighted as backticks. "
+			"1 highlighted inside. "
+			"2 highlighted inside with extra scope tracking.");
+
 		DefineWordListSets(bashWordListDesc);
 	}
 };
 
+class QuoteCls {	// Class to manage quote pairs (simplified vs LexPerl)
+public:
+	int Count = 0;
+	int Up = '\0';
+	int Down = '\0';
+	QuoteStyle Style = QuoteStyle::Literal;
+	int Outer = SCE_SH_DEFAULT;
+	void Clear() noexcept {
+		Count = 0;
+		Up	  = '\0';
+		Down  = '\0';
+		Style = QuoteStyle::Literal;
+		Outer = SCE_SH_DEFAULT;
+	}
+	void Start(int u, QuoteStyle s, int outer) noexcept {
+		Count = 1;
+		Up    = u;
+		Down  = opposite(Up);
+		Style = s;
+		Outer = outer;
+	}
+};
+
+class QuoteStackCls {	// Class to manage quote pairs that nest
+public:
+	int Depth = 0;
+	int State = SCE_SH_DEFAULT;
+	CommandSubstitution commandSubstitution = CommandSubstitution::Backtick;
+	int insideCommand = 0;
+	QuoteCls Current;
+	QuoteCls Stack[BASH_QUOTE_STACK_MAX];
+	[[nodiscard]] bool Empty() const noexcept {
+		return Current.Up == '\0';
+	}
+	void Start(int u, QuoteStyle s, int outer) noexcept {
+		if (Empty()) {
+			Current.Start(u, s, outer);
+		} else {
+			Push(u, s, outer);
+		}
+	}
+	void Push(int u, QuoteStyle s, int outer) noexcept {
+		if (Depth >= BASH_QUOTE_STACK_MAX) {
+			return;
+		}
+		Stack[Depth] = Current;
+		Depth++;
+		Current.Start(u, s, outer);
+	}
+	void Pop() noexcept {
+		if (Depth == 0) {
+			Clear();
+			return;
+		}
+		if (insideCommand != 0) {
+			insideCommand = 0;
+			for (int i = 0; i < Depth; i++) {
+				if (Stack[i].Style == QuoteStyle::CommandInside) {
+					insideCommand = commandSubstitutionFlag;
+					break;
+				}
+			}
+		}
+		Depth--;
+		Current = Stack[Depth];
+	}
+	void Clear() noexcept {
+		Depth = 0;
+		State = SCE_SH_DEFAULT;
+		insideCommand = 0;
+		Current.Clear();
+	}
+	bool CountDown(StyleContext &sc, CmdState &cmdState) {
+		Current.Count--;
+		if (Current.Count == 1 && sc.Match(')', ')')) {
+			Current.Count--;
+			sc.Forward();
+		}
+		if (Current.Count == 0) {
+			cmdState = CmdState::Body;
+			const int outer = Current.Outer;
+			Pop();
+			sc.ForwardSetState(outer | insideCommand);
+			return true;
+		}
+		return false;
+	}
+	void Expand(StyleContext &sc, CmdState &cmdState, bool stylingInside) {
+		const int state = sc.state;
+		QuoteStyle style = QuoteStyle::Literal;
+		State = state;
+		sc.SetState(SCE_SH_SCALAR);
+		sc.Forward();
+		if (sc.ch == '{') {
+			style = QuoteStyle::Parameter;
+			sc.ChangeState(SCE_SH_PARAM);
+		} else if (sc.ch == '\'') {
+			style = QuoteStyle::CString;
+			sc.ChangeState(SCE_SH_STRING);
+		} else if (sc.ch == '"') {
+			style = QuoteStyle::LString;
+			sc.ChangeState(SCE_SH_STRING);
+		} else if (sc.ch == '(' || sc.ch == '[') {
+			if (sc.ch == '[' || sc.chNext == '(') {
+				style = QuoteStyle::Arithmetic;
+				cmdState = CmdState::Arithmetic;
+				sc.ChangeState(SCE_SH_OPERATOR);
+			} else {
+				if (stylingInside && commandSubstitution >= CommandSubstitution::Inside) {
+					style = QuoteStyle::CommandInside;
+					cmdState = CmdState::Delimiter;
+					sc.ChangeState(SCE_SH_OPERATOR);
+					if (commandSubstitution == CommandSubstitution::InsideTrack) {
+						insideCommand = commandSubstitutionFlag;
+					}
+				} else {
+					style = QuoteStyle::Command;
+					sc.ChangeState(SCE_SH_BACKTICKS);
+				}
+			}
+			if (sc.Match('(', '(') && state == SCE_SH_DEFAULT && Depth == 0) {
+				// optimized to avoid track nested delimiter pairs
+				style = QuoteStyle::Literal;
+			}
+		} else if (sc.ch == '`') {	// $` seen in a configure script, valid?
+			style = QuoteStyle::Backtick;
+			sc.ChangeState(SCE_SH_BACKTICKS);
+		} else {
+			// scalar has no delimiter pair
+		}
+		if (!stylingInside) {
+			sc.ChangeState(state);
+		} else {
+			sc.ChangeState(sc.state | insideCommand);
+		}
+		if (style != QuoteStyle::Literal) {
+			Start(sc.ch, style, state);
+			sc.Forward();
+		}
+	}
+};
+
 const char styleSubable[] = { SCE_SH_IDENTIFIER, SCE_SH_SCALAR, 0 };
 
-LexicalClass lexicalClasses[] = {
+const LexicalClass lexicalClasses[] = {
 	// Lexer Bash SCLEX_BASH SCE_SH_:
 	0, "SCE_SH_DEFAULT", "default", "White space",
 	1, "SCE_SH_ERROR", "error", "Error",
@@ -196,8 +396,11 @@ LexicalClass lexicalClasses[] = {
 
 }
 
-class LexerBash : public DefaultLexer {
+class LexerBash final : public DefaultLexer {
 	WordList keywords;
+	WordList cmdDelimiter;
+	WordList bashStruct;
+	WordList bashStruct_in;
 	OptionsBash options;
 	OptionSetBash osBash;
 	enum { ssIdentifier, ssScalar };
@@ -206,8 +409,9 @@ class LexerBash : public DefaultLexer {
 	LexerBash() :
 		DefaultLexer("bash", SCLEX_BASH, lexicalClasses, ELEMENTS(lexicalClasses)),
 		subStyles(styleSubable, 0x80, 0x40, 0) {
-	}
-	virtual ~LexerBash() {
+		cmdDelimiter.Set("| || |& & && ; ;; ( ) { }");
+		bashStruct.Set("if elif fi while until else then do done esac eval");
+		bashStruct_in.Set("for case select");
 	}
 	void SCI_METHOD Release() override {
 		delete this;
@@ -236,7 +440,7 @@ class LexerBash : public DefaultLexer {
 	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
 
 	void * SCI_METHOD PrivateCall(int, void *) override {
-		return 0;
+		return nullptr;
 	}
 
 	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override {
@@ -281,7 +485,7 @@ Sci_Position SCI_METHOD LexerBash::PropertySet(const char *key, const char *val)
 }
 
 Sci_Position SCI_METHOD LexerBash::WordListSet(int n, const char *wl) {
-	WordList *wordListN = 0;
+	WordList *wordListN = nullptr;
 	switch (n) {
 	case 0:
 		wordListN = &keywords;
@@ -289,10 +493,7 @@ Sci_Position SCI_METHOD LexerBash::WordListSet(int n, const char *wl) {
 	}
 	Sci_Position firstModification = -1;
 	if (wordListN) {
-		WordList wlNew;
-		wlNew.Set(wl);
-		if (*wordListN != wlNew) {
-			wordListN->Set(wl);
+		if (wordListN->Set(wl)) {
 			firstModification = 0;
 		}
 	}
@@ -300,127 +501,48 @@ Sci_Position SCI_METHOD LexerBash::WordListSet(int n, const char *wl) {
 }
 
 void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
-	WordList cmdDelimiter, bashStruct, bashStruct_in;
-	cmdDelimiter.Set("| || |& & && ; ;; ( ) { }");
-	bashStruct.Set("if elif fi while until else then do done esac eval");
-	bashStruct_in.Set("for case select");
-
-	CharacterSet setWordStart(CharacterSet::setAlpha, "_");
+	const CharacterSet setWordStart(CharacterSet::setAlpha, "_");
 	// note that [+-] are often parts of identifiers in shell scripts
-	CharacterSet setWord(CharacterSet::setAlphaNum, "._+-");
+	const CharacterSet setWord(CharacterSet::setAlphaNum, "._+-");
 	CharacterSet setMetaCharacter(CharacterSet::setNone, "|&;()<> \t\r\n");
 	setMetaCharacter.Add(0);
-	CharacterSet setBashOperator(CharacterSet::setNone, "^&%()-+=|{}[]:;>,*/<?!.~@");
-	CharacterSet setSingleCharOp(CharacterSet::setNone, "rwxoRWXOezsfdlpSbctugkTBMACahGLNn");
-	CharacterSet setParam(CharacterSet::setAlphaNum, "$_");
-	CharacterSet setHereDoc(CharacterSet::setAlpha, "_\\-+!%*,./:?@[]^`{}~");
-	CharacterSet setHereDoc2(CharacterSet::setAlphaNum, "_-+!%*,./:=?@[]^`{}~");
-	CharacterSet setLeftShift(CharacterSet::setDigits, "$");
+	const CharacterSet setBashOperator(CharacterSet::setNone, "^&%()-+=|{}[]:;>,*/<?!.~@");
+	const CharacterSet setSingleCharOp(CharacterSet::setNone, "rwxoRWXOezsfdlpSbctugkTBMACahGLNn");
+	const CharacterSet setParam(CharacterSet::setAlphaNum, "_");
+	const CharacterSet setHereDoc(CharacterSet::setAlpha, "_\\-+!%*,./:?@[]^`{}~");
+	const CharacterSet setHereDoc2(CharacterSet::setAlphaNum, "_-+!%*,./:=?@[]^`{}~");
+	const CharacterSet setLeftShift(CharacterSet::setDigits, "$");
 
 	class HereDocCls {	// Class to manage HERE document elements
 	public:
-		int State;		// 0: '<<' encountered
+		int State = 0;			// 0: '<<' encountered
 		// 1: collect the delimiter
 		// 2: here doc text (lines after the delimiter)
-		int Quote;		// the char after '<<'
-		bool Quoted;		// true if Quote in ('\'','"','`')
-		bool Indent;		// indented delimiter (for <<-)
-		int DelimiterLength;	// strlen(Delimiter)
-		char Delimiter[HERE_DELIM_MAX];	// the Delimiter
-		HereDocCls() {
-			State = 0;
-			Quote = 0;
-			Quoted = false;
-			Indent = 0;
-			DelimiterLength = 0;
-			Delimiter[0] = '\0';
-		}
+		int Quote = '\0';		// the char after '<<'
+		bool Quoted = false;		// true if Quote in ('\'','"','`')
+		bool Escaped = false;		// backslash in delimiter, common in configure script
+		bool Indent = false;		// indented delimiter (for <<-)
+		int DelimiterLength = 0;	// strlen(Delimiter)
+		char Delimiter[HERE_DELIM_MAX]{};	// the Delimiter
+		HereDocCls() noexcept = default;
 		void Append(int ch) {
 			Delimiter[DelimiterLength++] = static_cast<char>(ch);
 			Delimiter[DelimiterLength] = '\0';
 		}
-		~HereDocCls() {
-		}
 	};
 	HereDocCls HereDoc;
 
-	class QuoteCls {	// Class to manage quote pairs (simplified vs LexPerl)
-		public:
-		int Count;
-		int Up, Down;
-		QuoteCls() {
-			Count = 0;
-			Up    = '\0';
-			Down  = '\0';
-		}
-		void Open(int u) {
-			Count++;
-			Up    = u;
-			Down  = opposite(Up);
-		}
-		void Start(int u) {
-			Count = 0;
-			Open(u);
-		}
-	};
-	QuoteCls Quote;
-
-	class QuoteStackCls {	// Class to manage quote pairs that nest
-		public:
-		int Count;
-		int Up, Down;
-		int Style;
-		int Depth;			// levels pushed
-		int CountStack[BASH_DELIM_STACK_MAX];
-		int UpStack   [BASH_DELIM_STACK_MAX];
-		int StyleStack[BASH_DELIM_STACK_MAX];
-		QuoteStackCls() {
-			Count = 0;
-			Up    = '\0';
-			Down  = '\0';
-			Style = 0;
-			Depth = 0;
-		}
-		void Start(int u, int s) {
-			Count = 1;
-			Up    = u;
-			Down  = opposite(Up);
-			Style = s;
-		}
-		void Push(int u, int s) {
-			if (Depth >= BASH_DELIM_STACK_MAX)
-				return;
-			CountStack[Depth] = Count;
-			UpStack   [Depth] = Up;
-			StyleStack[Depth] = Style;
-			Depth++;
-			Count = 1;
-			Up    = u;
-			Down  = opposite(Up);
-			Style = s;
-		}
-		void Pop(void) {
-			if (Depth <= 0)
-				return;
-			Depth--;
-			Count = CountStack[Depth];
-			Up    = UpStack   [Depth];
-			Style = StyleStack[Depth];
-			Down  = opposite(Up);
-		}
-		~QuoteStackCls() {
-		}
-	};
 	QuoteStackCls QuoteStack;
+	QuoteStack.commandSubstitution = static_cast<CommandSubstitution>(options.commandSubstitution);
 
 	const WordClassifier &classifierIdentifiers = subStyles.Classifier(SCE_SH_IDENTIFIER);
 	const WordClassifier &classifierScalars = subStyles.Classifier(SCE_SH_SCALAR);
 
 	int numBase = 0;
-	int digit;
-	Sci_PositionU endPos = startPos + length;
-	int cmdState = BASH_CMD_START;
-	int testExprType = 0;
+	int digit = 0;
+	const Sci_PositionU endPos = startPos + length;
+	CmdState cmdState = CmdState::Start;
+	TestExprType testExprType = TestExprType::Test;
 	LexAccessor styler(pAccess);
 
 	// Always backtracks to the start of a line that is not a continuation
@@ -430,7 +552,7 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 		ln--;
 	for (;;) {
 		startPos = styler.LineStart(ln);
-		if (ln == 0 || styler.GetLineState(ln) == BASH_CMD_START)
+		if (ln == 0 || styler.GetLineState(ln) == static_cast<int>(CmdState::Start))
 			break;
 		ln--;
 	}
@@ -438,45 +560,47 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 
 	StyleContext sc(startPos, endPos - startPos, initStyle, styler);
 
-	for (; sc.More(); sc.Forward()) {
+	while (sc.More()) {
 
 		// handle line continuation, updates per-line stored state
 		if (sc.atLineStart) {
-			ln = styler.GetLine(sc.currentPos);
-			if (sc.state == SCE_SH_STRING
-			 || sc.state == SCE_SH_BACKTICKS
-			 || sc.state == SCE_SH_CHARACTER
-			 || sc.state == SCE_SH_HERE_Q
-			 || sc.state == SCE_SH_COMMENTLINE
-			 || sc.state == SCE_SH_PARAM) {
+			if (MaskCommand(sc.state) == SCE_SH_STRING
+			 || MaskCommand(sc.state) == SCE_SH_BACKTICKS
+			 || MaskCommand(sc.state) == SCE_SH_CHARACTER
+			 || MaskCommand(sc.state) == SCE_SH_HERE_Q
+			 || MaskCommand(sc.state) == SCE_SH_COMMENTLINE
+			 || MaskCommand(sc.state) == SCE_SH_PARAM) {
 				// force backtrack while retaining cmdState
-				styler.SetLineState(ln, BASH_CMD_BODY);
+				styler.SetLineState(sc.currentLine, static_cast<int>(CmdState::Body));
 			} else {
-				if (ln > 0) {
+				if (sc.currentLine > 0) {
 					if ((sc.GetRelative(-3) == '\\' && sc.GetRelative(-2) == '\r' && sc.chPrev == '\n')
 					 || sc.GetRelative(-2) == '\\') {	// handle '\' line continuation
 						// retain last line's state
 					} else
-						cmdState = BASH_CMD_START;
+						cmdState = CmdState::Start;
 				}
-				styler.SetLineState(ln, cmdState);
+				// force backtrack when nesting
+				const CmdState state = QuoteStack.Empty() ? cmdState : CmdState::Body;
+				styler.SetLineState(sc.currentLine, static_cast<int>(state));
 			}
 		}
 
 		// controls change of cmdState at the end of a non-whitespace element
-		// states BODY|TEST|ARITH persist until the end of a command segment
-		// state WORD persist, but ends with 'in' or 'do' construct keywords
-		int cmdStateNew = BASH_CMD_BODY;
-		if (cmdState == BASH_CMD_TEST || cmdState == BASH_CMD_ARITH || cmdState == BASH_CMD_WORD)
+		// states Body|Test|Arithmetic persist until the end of a command segment
+		// state Word persist, but ends with 'in' or 'do' construct keywords
+		CmdState cmdStateNew = CmdState::Body;
+		if (cmdState == CmdState::Test || cmdState == CmdState::Arithmetic || cmdState == CmdState::Word)
 			cmdStateNew = cmdState;
-		int stylePrev = sc.state;
+		const int stylePrev = MaskCommand(sc.state);
+		const int insideCommand = QuoteStack.insideCommand;
 
 		// Determine if the current state should terminate.
-		switch (sc.state) {
+		switch (MaskCommand(sc.state)) {
 			case SCE_SH_OPERATOR:
-				sc.SetState(SCE_SH_DEFAULT);
-				if (cmdState == BASH_CMD_DELIM)		// if command delimiter, start new command
-					cmdStateNew = BASH_CMD_START;
+				sc.SetState(SCE_SH_DEFAULT | insideCommand);
+				if (cmdState == CmdState::Delimiter)		// if command delimiter, start new command
+					cmdStateNew = CmdState::Start;
 				else if (sc.chPrev == '\\')			// propagate command state if line continued
 					cmdStateNew = cmdState;
 				break;
@@ -484,77 +608,76 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 				// "." never used in Bash variable names but used in file names
 				if (!setWord.Contains(sc.ch)) {
 					char s[500];
-					char s2[10];
 					sc.GetCurrent(s, sizeof(s));
-					int identifierStyle = SCE_SH_IDENTIFIER;
-					int subStyle = classifierIdentifiers.ValueFor(s);
+					int identifierStyle = SCE_SH_IDENTIFIER | insideCommand;
+					const int subStyle = classifierIdentifiers.ValueFor(s);
 					if (subStyle >= 0) {
-						identifierStyle = subStyle;
+						identifierStyle = subStyle | insideCommand;
 					}
 					// allow keywords ending in a whitespace or command delimiter
+					char s2[10];
 					s2[0] = static_cast<char>(sc.ch);
 					s2[1] = '\0';
-					bool keywordEnds = IsASpace(sc.ch) || cmdDelimiter.InList(s2);
+					const bool keywordEnds = IsASpace(sc.ch) || cmdDelimiter.InList(s2);
 					// 'in' or 'do' may be construct keywords
-					if (cmdState == BASH_CMD_WORD) {
+					if (cmdState == CmdState::Word) {
 						if (strcmp(s, "in") == 0 && keywordEnds)
-							cmdStateNew = BASH_CMD_BODY;
+							cmdStateNew = CmdState::Body;
 						else if (strcmp(s, "do") == 0 && keywordEnds)
-							cmdStateNew = BASH_CMD_START;
+							cmdStateNew = CmdState::Start;
 						else
 							sc.ChangeState(identifierStyle);
-						sc.SetState(SCE_SH_DEFAULT);
+						sc.SetState(SCE_SH_DEFAULT | insideCommand);
 						break;
 					}
 					// a 'test' keyword starts a test expression
 					if (strcmp(s, "test") == 0) {
-						if (cmdState == BASH_CMD_START && keywordEnds) {
-							cmdStateNew = BASH_CMD_TEST;
-							testExprType = 0;
+						if (cmdState == CmdState::Start && keywordEnds) {
+							cmdStateNew = CmdState::Test;
+							testExprType = TestExprType::Test;
 						} else
 							sc.ChangeState(identifierStyle);
 					}
 					// detect bash construct keywords
 					else if (bashStruct.InList(s)) {
-						if (cmdState == BASH_CMD_START && keywordEnds)
-							cmdStateNew = BASH_CMD_START;
+						if (cmdState == CmdState::Start && keywordEnds)
+							cmdStateNew = CmdState::Start;
 						else
 							sc.ChangeState(identifierStyle);
 					}
 					// 'for'|'case'|'select' needs 'in'|'do' to be highlighted later
 					else if (bashStruct_in.InList(s)) {
-						if (cmdState == BASH_CMD_START && keywordEnds)
-							cmdStateNew = BASH_CMD_WORD;
+						if (cmdState == CmdState::Start && keywordEnds)
+							cmdStateNew = CmdState::Word;
 						else
 							sc.ChangeState(identifierStyle);
 					}
 					// disambiguate option items and file test operators
 					else if (s[0] == '-') {
-						if (cmdState != BASH_CMD_TEST)
+						if (cmdState != CmdState::Test)
 							sc.ChangeState(identifierStyle);
 					}
 					// disambiguate keywords and identifiers
-					else if (cmdState != BASH_CMD_START
+					else if (cmdState != CmdState::Start
 						  || !(keywords.InList(s) && keywordEnds)) {
 						sc.ChangeState(identifierStyle);
 					}
-					sc.SetState(SCE_SH_DEFAULT);
+					sc.SetState(SCE_SH_DEFAULT | insideCommand);
 				}
 				break;
 			case SCE_SH_IDENTIFIER:
 				if (sc.chPrev == '\\' || !setWord.Contains(sc.ch) ||
-					  (cmdState == BASH_CMD_ARITH && !setWordStart.Contains(sc.ch))) {
+					  (cmdState == CmdState::Arithmetic && !setWordStart.Contains(sc.ch))) {
 					char s[500];
 					sc.GetCurrent(s, sizeof(s));
-					int subStyle = classifierIdentifiers.ValueFor(s);
+					const int subStyle = classifierIdentifiers.ValueFor(s);
 					if (subStyle >= 0) {
-						sc.ChangeState(subStyle);
+						sc.ChangeState(subStyle | insideCommand);
 					}
 					if (sc.chPrev == '\\') {	// for escaped chars
-						sc.ForwardSetState(SCE_SH_DEFAULT);
-					} else {
-						sc.SetState(SCE_SH_DEFAULT);
+						sc.Forward();
 					}
+					sc.SetState(SCE_SH_DEFAULT | insideCommand);
 				}
 				break;
 			case SCE_SH_NUMBER:
@@ -604,13 +727,13 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 					|| numBase == BASH_BASE_OCTAL_ERROR
 #endif
 				) {
-					sc.ChangeState(SCE_SH_ERROR);
+					sc.ChangeState(SCE_SH_ERROR | insideCommand);
 				}
-				sc.SetState(SCE_SH_DEFAULT);
+				sc.SetState(SCE_SH_DEFAULT | insideCommand);
 				break;
 			case SCE_SH_COMMENTLINE:
 				if (sc.MatchLineEnd() && sc.chPrev != '\\') {
-					sc.SetState(SCE_SH_DEFAULT);
+					sc.SetState(SCE_SH_DEFAULT | insideCommand);
 				}
 				break;
 			case SCE_SH_HERE_DELIM:
@@ -623,6 +746,7 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 				if (HereDoc.State == 0) { // '<<' encountered
 					HereDoc.Quote = sc.chNext;
 					HereDoc.Quoted = false;
+					HereDoc.Escaped = false;
 					HereDoc.DelimiterLength = 0;
 					HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
 					if (sc.chNext == '\'' || sc.chNext == '\"') {	// a quoted here-doc delimiter (' or ")
@@ -630,19 +754,19 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 						HereDoc.Quoted = true;
 						HereDoc.State = 1;
 					} else if (setHereDoc.Contains(sc.chNext) ||
-					           (sc.chNext == '=' && cmdState != BASH_CMD_ARITH)) {
+					           (sc.chNext == '=' && cmdState != CmdState::Arithmetic)) {
 						// an unquoted here-doc delimiter, no special handling
 						HereDoc.State = 1;
 					} else if (sc.chNext == '<') {	// HERE string <<<
 						sc.Forward();
-						sc.ForwardSetState(SCE_SH_DEFAULT);
+						sc.ForwardSetState(SCE_SH_DEFAULT | insideCommand);
 					} else if (IsASpace(sc.chNext)) {
 						// eat whitespace
 					} else if (setLeftShift.Contains(sc.chNext) ||
-					           (sc.chNext == '=' && cmdState == BASH_CMD_ARITH)) {
+					           (sc.chNext == '=' && cmdState == CmdState::Arithmetic)) {
 						// left shift <<$var or <<= cases
-						sc.ChangeState(SCE_SH_OPERATOR);
-						sc.ForwardSetState(SCE_SH_DEFAULT);
+						sc.ChangeState(SCE_SH_OPERATOR | insideCommand);
+						sc.ForwardSetState(SCE_SH_DEFAULT | insideCommand);
 					} else {
 						// symbols terminates; deprecated zero-length delimiter
 						HereDoc.State = 1;
@@ -658,6 +782,7 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 					} else if (HereDoc.Quoted && sc.ch == HereDoc.Quote) {	// closing quote => end of delimiter
 						sc.ForwardSetState(SCE_SH_DEFAULT);
 					} else if (sc.ch == '\\') {
+						HereDoc.Escaped = true;
 						if (HereDoc.Quoted && sc.chNext != HereDoc.Quote && sc.chNext != '\\') {
 							// in quoted prefixes only \ and the quote eat the escape
 							HereDoc.Append(sc.ch);
@@ -665,130 +790,114 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 							// skip escape prefix
 						}
 					} else if (!HereDoc.Quoted) {
-						sc.SetState(SCE_SH_DEFAULT);
+						sc.SetState(SCE_SH_DEFAULT | insideCommand);
 					}
 					if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {	// force blowup
-						sc.SetState(SCE_SH_ERROR);
+						sc.SetState(SCE_SH_ERROR | insideCommand);
 						HereDoc.State = 0;
 					}
 				}
 				break;
-			case SCE_SH_HERE_Q:
-				// HereDoc.State == 2
-				if (sc.atLineStart) {
-					sc.SetState(SCE_SH_HERE_Q);
-					int prefixws = 0;
-					while (sc.ch == '\t' && !sc.MatchLineEnd()) {	// tabulation prefix
-						sc.Forward();
-						prefixws++;
-					}
-					if (prefixws > 0)
-						sc.SetState(SCE_SH_HERE_Q);
-					while (!sc.MatchLineEnd()) {
-						sc.Forward();
-					}
-					char s[HERE_DELIM_MAX];
-					sc.GetCurrent(s, sizeof(s));
-					if (sc.LengthCurrent() == 0) {  // '' or "" delimiters
-						if ((prefixws == 0 || HereDoc.Indent) &&
-							HereDoc.Quoted && HereDoc.DelimiterLength == 0)
-							sc.SetState(SCE_SH_DEFAULT);
-						break;
-					}
-					if (s[strlen(s) - 1] == '\r')
-						s[strlen(s) - 1] = '\0';
-					if (strcmp(HereDoc.Delimiter, s) == 0) {
-						if ((prefixws == 0) ||	// indentation rule
-							(prefixws > 0 && HereDoc.Indent)) {
-							sc.SetState(SCE_SH_DEFAULT);
-							break;
-						}
-					}
-				}
-				break;
 			case SCE_SH_SCALAR:	// variable names
 				if (!setParam.Contains(sc.ch)) {
 					char s[500];
 					sc.GetCurrent(s, sizeof(s));
-					int subStyle = classifierScalars.ValueFor(&s[1]); // skip the $
+					const int subStyle = classifierScalars.ValueFor(&s[1]); // skip the $
 					if (subStyle >= 0) {
-						sc.ChangeState(subStyle);
+						sc.ChangeState(subStyle | insideCommand);
 					}
 					if (sc.LengthCurrent() == 1) {
 						// Special variable: $(, $_ etc.
-						sc.ForwardSetState(SCE_SH_DEFAULT);
-					} else {
-						sc.SetState(SCE_SH_DEFAULT);
+						sc.Forward();
 					}
+					sc.SetState(QuoteStack.State | insideCommand);
+					continue;
 				}
 				break;
+			case SCE_SH_HERE_Q:
+				// HereDoc.State == 2
+				if (sc.atLineStart && QuoteStack.Current.Style == QuoteStyle::HereDoc) {
+					sc.SetState(SCE_SH_HERE_Q | insideCommand);
+					if (HereDoc.Indent) { // tabulation prefix
+						while (sc.ch == '\t') {
+							sc.Forward();
+						}
+					}
+					if ((static_cast<Sci_Position>(sc.currentPos + HereDoc.DelimiterLength) == sc.lineEnd) &&
+						(HereDoc.DelimiterLength == 0 || sc.Match(HereDoc.Delimiter))) {
+						while (!sc.MatchLineEnd()) {
+							sc.Forward();
+						}
+						QuoteStack.Pop();
+						sc.SetState(SCE_SH_DEFAULT | QuoteStack.insideCommand);
+						break;
+					}
+				}
+				if (HereDoc.Quoted || HereDoc.Escaped) {
+					break;
+				}
+				// fall through to handle nested shell expansions
+				[[fallthrough]];
 			case SCE_SH_STRING:	// delimited styles, can nest
+			case SCE_SH_PARAM: // ${parameter}
 			case SCE_SH_BACKTICKS:
-				if (sc.ch == '\\' && QuoteStack.Up != '\\') {
-					if (QuoteStack.Style != BASH_DELIM_LITERAL)
+				if (sc.ch == '\\') {
+					if (QuoteStack.Current.Style != QuoteStyle::Literal)
 						sc.Forward();
-				} else if (sc.ch == QuoteStack.Down) {
-					QuoteStack.Count--;
-					if (QuoteStack.Count == 0) {
-						if (QuoteStack.Depth > 0) {
-							QuoteStack.Pop();
-						} else
-							sc.ForwardSetState(SCE_SH_DEFAULT);
+				} else if (sc.ch == QuoteStack.Current.Down) {
+					if (QuoteStack.CountDown(sc, cmdState)) {
+						continue;
 					}
-				} else if (sc.ch == QuoteStack.Up) {
-					QuoteStack.Count++;
+				} else if (sc.ch == QuoteStack.Current.Up) {
+					QuoteStack.Current.Count++;
 				} else {
-					if (QuoteStack.Style == BASH_DELIM_STRING ||
-						QuoteStack.Style == BASH_DELIM_LSTRING
-					) {	// do nesting for "string", $"locale-string"
+					if (QuoteStack.Current.Style == QuoteStyle::String ||
+						QuoteStack.Current.Style == QuoteStyle::HereDoc ||
+						QuoteStack.Current.Style == QuoteStyle::LString
+					) {	// do nesting for "string", $"locale-string", heredoc
+						const bool stylingInside = options.stylingInside(MaskCommand(sc.state));
 						if (sc.ch == '`') {
-							QuoteStack.Push(sc.ch, BASH_DELIM_BACKTICK);
-						} else if (sc.ch == '$' && sc.chNext == '(') {
-							sc.Forward();
-							QuoteStack.Push(sc.ch, BASH_DELIM_COMMAND);
+							QuoteStack.Push(sc.ch, QuoteStyle::Backtick, sc.state);
+							if (stylingInside) {
+								sc.SetState(SCE_SH_BACKTICKS | insideCommand);
+							}
+						} else if (sc.ch == '$') {
+							QuoteStack.Expand(sc, cmdState, stylingInside);
+							continue;
 						}
-					} else if (QuoteStack.Style == BASH_DELIM_COMMAND ||
-							   QuoteStack.Style == BASH_DELIM_BACKTICK
-					) {	// do nesting for $(command), `command`
+					} else if (QuoteStack.Current.Style == QuoteStyle::Command ||
+							   QuoteStack.Current.Style == QuoteStyle::Parameter ||
+							   QuoteStack.Current.Style == QuoteStyle::Backtick
+					) {	// do nesting for $(command), `command`, ${parameter}
+						const bool stylingInside = options.stylingInside(MaskCommand(sc.state));
 						if (sc.ch == '\'') {
-							QuoteStack.Push(sc.ch, BASH_DELIM_LITERAL);
+							if (stylingInside) {
+								QuoteStack.State = sc.state;
+								sc.SetState(SCE_SH_CHARACTER | insideCommand);
+							} else {
+								QuoteStack.Push(sc.ch, QuoteStyle::Literal, sc.state);
+							}
 						} else if (sc.ch == '\"') {
-							QuoteStack.Push(sc.ch, BASH_DELIM_STRING);
+							QuoteStack.Push(sc.ch, QuoteStyle::String, sc.state);
+							if (stylingInside) {
+								sc.SetState(SCE_SH_STRING | insideCommand);
+							}
 						} else if (sc.ch == '`') {
-							QuoteStack.Push(sc.ch, BASH_DELIM_BACKTICK);
-						} else if (sc.ch == '$') {
-							if (sc.chNext == '\'') {
-								sc.Forward();
-								QuoteStack.Push(sc.ch, BASH_DELIM_CSTRING);
-							} else if (sc.chNext == '\"') {
-								sc.Forward();
-								QuoteStack.Push(sc.ch, BASH_DELIM_LSTRING);
-							} else if (sc.chNext == '(') {
-								sc.Forward();
-								QuoteStack.Push(sc.ch, BASH_DELIM_COMMAND);
+							QuoteStack.Push(sc.ch, QuoteStyle::Backtick, sc.state);
+							if (stylingInside) {
+								sc.SetState(SCE_SH_BACKTICKS | insideCommand);
 							}
+						} else if (sc.ch == '$') {
+							QuoteStack.Expand(sc, cmdState, stylingInside);
+							continue;
 						}
 					}
 				}
 				break;
-			case SCE_SH_PARAM: // ${parameter}
-				if (sc.ch == '\\' && Quote.Up != '\\') {
-					sc.Forward();
-				} else if (sc.ch == Quote.Down) {
-					Quote.Count--;
-					if (Quote.Count == 0) {
-						sc.ForwardSetState(SCE_SH_DEFAULT);
-					}
-				} else if (sc.ch == Quote.Up) {
-					Quote.Count++;
-				}
-				break;
 			case SCE_SH_CHARACTER: // singly-quoted strings
-				if (sc.ch == Quote.Down) {
-					Quote.Count--;
-					if (Quote.Count == 0) {
-						sc.ForwardSetState(SCE_SH_DEFAULT);
-					}
+				if (sc.ch == '\'') {
+					sc.ForwardSetState(QuoteStack.State | insideCommand);
+					continue;
 				}
 				break;
 		}
@@ -800,37 +909,39 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 			// first line of here-doc seem to follow the style of the last EOL sequence
 			HereDoc.State = 2;
 			if (HereDoc.Quoted) {
-				if (sc.state == SCE_SH_HERE_DELIM) {
+				if (MaskCommand(sc.state) == SCE_SH_HERE_DELIM) {
 					// Missing quote at end of string! Syntax error in bash 4.3
 					// Mark this bit as an error, do not colour any here-doc
-					sc.ChangeState(SCE_SH_ERROR);
-					sc.SetState(SCE_SH_DEFAULT);
+					sc.ChangeState(SCE_SH_ERROR | insideCommand);
+					sc.SetState(SCE_SH_DEFAULT | insideCommand);
 				} else {
 					// HereDoc.Quote always == '\''
-					sc.SetState(SCE_SH_HERE_Q);
+					sc.SetState(SCE_SH_HERE_Q | insideCommand);
+					QuoteStack.Start(-1, QuoteStyle::HereDoc, SCE_SH_DEFAULT);
 				}
 			} else if (HereDoc.DelimiterLength == 0) {
 				// no delimiter, illegal (but '' and "" are legal)
-				sc.ChangeState(SCE_SH_ERROR);
-				sc.SetState(SCE_SH_DEFAULT);
+				sc.ChangeState(SCE_SH_ERROR | insideCommand);
+				sc.SetState(SCE_SH_DEFAULT | insideCommand);
 			} else {
-				sc.SetState(SCE_SH_HERE_Q);
+				sc.SetState(SCE_SH_HERE_Q | insideCommand);
+				QuoteStack.Start(-1, QuoteStyle::HereDoc, SCE_SH_DEFAULT);
 			}
 		}
 
 		// update cmdState about the current command segment
-		if (stylePrev != SCE_SH_DEFAULT && sc.state == SCE_SH_DEFAULT) {
+		if (stylePrev != SCE_SH_DEFAULT && MaskCommand(sc.state) == SCE_SH_DEFAULT) {
 			cmdState = cmdStateNew;
 		}
 		// Determine if a new state should be entered.
-		if (sc.state == SCE_SH_DEFAULT) {
+		if (MaskCommand(sc.state) == SCE_SH_DEFAULT) {
 			if (sc.ch == '\\') {
 				// Bash can escape any non-newline as a literal
-				sc.SetState(SCE_SH_IDENTIFIER);
+				sc.SetState(SCE_SH_IDENTIFIER | insideCommand);
 				if (sc.chNext == '\r' || sc.chNext == '\n')
-					sc.SetState(SCE_SH_OPERATOR);
+					sc.SetState(SCE_SH_OPERATOR | insideCommand);
 			} else if (IsADigit(sc.ch)) {
-				sc.SetState(SCE_SH_NUMBER);
+				sc.SetState(SCE_SH_NUMBER | insideCommand);
 				numBase = BASH_BASE_DECIMAL;
 				if (sc.ch == '0') {	// hex,octal
 					if (sc.chNext == 'x' || sc.chNext == 'X') {
@@ -845,67 +956,45 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 					}
 				}
 			} else if (setWordStart.Contains(sc.ch)) {
-				sc.SetState(SCE_SH_WORD);
+				sc.SetState(SCE_SH_WORD | insideCommand);
 			} else if (sc.ch == '#') {
 				if (stylePrev != SCE_SH_WORD && stylePrev != SCE_SH_IDENTIFIER &&
 					(sc.currentPos == 0 || setMetaCharacter.Contains(sc.chPrev))) {
-					sc.SetState(SCE_SH_COMMENTLINE);
+					sc.SetState(SCE_SH_COMMENTLINE | insideCommand);
 				} else {
-					sc.SetState(SCE_SH_WORD);
+					sc.SetState(SCE_SH_WORD | insideCommand);
 				}
 				// handle some zsh features within arithmetic expressions only
-				if (cmdState == BASH_CMD_ARITH) {
+				if (cmdState == CmdState::Arithmetic) {
 					if (sc.chPrev == '[') {	// [#8] [##8] output digit setting
-						sc.SetState(SCE_SH_WORD);
+						sc.SetState(SCE_SH_WORD | insideCommand);
 						if (sc.chNext == '#') {
 							sc.Forward();
 						}
 					} else if (sc.Match("##^") && IsUpperCase(sc.GetRelative(3))) {	// ##^A
-						sc.SetState(SCE_SH_IDENTIFIER);
+						sc.SetState(SCE_SH_IDENTIFIER | insideCommand);
 						sc.Forward(3);
 					} else if (sc.chNext == '#' && !IsASpace(sc.GetRelative(2))) {	// ##a
-						sc.SetState(SCE_SH_IDENTIFIER);
+						sc.SetState(SCE_SH_IDENTIFIER | insideCommand);
 						sc.Forward(2);
 					} else if (setWordStart.Contains(sc.chNext)) {	// #name
-						sc.SetState(SCE_SH_IDENTIFIER);
+						sc.SetState(SCE_SH_IDENTIFIER | insideCommand);
 					}
 				}
 			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_SH_STRING);
-				QuoteStack.Start(sc.ch, BASH_DELIM_STRING);
+				sc.SetState(SCE_SH_STRING | insideCommand);
+				QuoteStack.Start(sc.ch, QuoteStyle::String, SCE_SH_DEFAULT);
 			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_SH_CHARACTER);
-				Quote.Start(sc.ch);
+				QuoteStack.State = SCE_SH_DEFAULT;
+				sc.SetState(SCE_SH_CHARACTER | insideCommand);
 			} else if (sc.ch == '`') {
-				sc.SetState(SCE_SH_BACKTICKS);
-				QuoteStack.Start(sc.ch, BASH_DELIM_BACKTICK);
+				sc.SetState(SCE_SH_BACKTICKS | insideCommand);
+				QuoteStack.Start(sc.ch, QuoteStyle::Backtick, SCE_SH_DEFAULT);
 			} else if (sc.ch == '$') {
-				if (sc.Match("$((")) {
-					sc.SetState(SCE_SH_OPERATOR);	// handle '((' later
-					continue;
-				}
-				sc.SetState(SCE_SH_SCALAR);
-				sc.Forward();
-				if (sc.ch == '{') {
-					sc.ChangeState(SCE_SH_PARAM);
-					Quote.Start(sc.ch);
-				} else if (sc.ch == '\'') {
-					sc.ChangeState(SCE_SH_STRING);
-					QuoteStack.Start(sc.ch, BASH_DELIM_CSTRING);
-				} else if (sc.ch == '"') {
-					sc.ChangeState(SCE_SH_STRING);
-					QuoteStack.Start(sc.ch, BASH_DELIM_LSTRING);
-				} else if (sc.ch == '(') {
-					sc.ChangeState(SCE_SH_BACKTICKS);
-					QuoteStack.Start(sc.ch, BASH_DELIM_COMMAND);
-				} else if (sc.ch == '`') {	// $` seen in a configure script, valid?
-					sc.ChangeState(SCE_SH_BACKTICKS);
-					QuoteStack.Start(sc.ch, BASH_DELIM_BACKTICK);
-				} else {
-					continue;	// scalar has no delimiter pair
-				}
-			} else if (sc.Match('<', '<')) {
-				sc.SetState(SCE_SH_HERE_DELIM);
+				QuoteStack.Expand(sc, cmdState, true);
+				continue;
+			} else if (cmdState != CmdState::Arithmetic && sc.Match('<', '<')) {
+				sc.SetState(SCE_SH_HERE_DELIM | insideCommand);
 				HereDoc.State = 0;
 				if (sc.GetRelative(2) == '-') {	// <<- indent case
 					HereDoc.Indent = true;
@@ -917,47 +1006,57 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 					   setSingleCharOp.Contains(sc.chNext) &&
 					   !setWord.Contains(sc.GetRelative(2)) &&
 					   IsASpace(sc.chPrev)) {
-				sc.SetState(SCE_SH_WORD);
+				sc.SetState(SCE_SH_WORD | insideCommand);
 				sc.Forward();
 			} else if (setBashOperator.Contains(sc.ch)) {
-				char s[10];
 				bool isCmdDelim = false;
-				sc.SetState(SCE_SH_OPERATOR);
+				sc.SetState(SCE_SH_OPERATOR | insideCommand);
+				// arithmetic expansion and command substitution
+				if (QuoteStack.Current.Style == QuoteStyle::Arithmetic || QuoteStack.Current.Style == QuoteStyle::CommandInside) {
+					if (sc.ch == QuoteStack.Current.Down) {
+						if (QuoteStack.CountDown(sc, cmdState)) {
+							continue;
+						}
+					} else if (sc.ch == QuoteStack.Current.Up) {
+						QuoteStack.Current.Count++;
+					}
+				}
 				// globs have no whitespace, do not appear in arithmetic expressions
-				if (cmdState != BASH_CMD_ARITH && sc.ch == '(' && sc.chNext != '(') {
-					int i = GlobScan(sc);
+				if (cmdState != CmdState::Arithmetic && sc.ch == '(' && sc.chNext != '(') {
+					const int i = GlobScan(sc);
 					if (i > 1) {
-						sc.SetState(SCE_SH_IDENTIFIER);
-						sc.Forward(i);
+						sc.SetState(SCE_SH_IDENTIFIER | insideCommand);
+						sc.Forward(i + 1);
 						continue;
 					}
 				}
 				// handle opening delimiters for test/arithmetic expressions - ((,[[,[
-				if (cmdState == BASH_CMD_START
-				 || cmdState == BASH_CMD_BODY) {
+				if (cmdState == CmdState::Start
+				 || cmdState == CmdState::Body) {
 					if (sc.Match('(', '(')) {
-						cmdState = BASH_CMD_ARITH;
+						cmdState = CmdState::Arithmetic;
 						sc.Forward();
 					} else if (sc.Match('[', '[') && IsASpace(sc.GetRelative(2))) {
-						cmdState = BASH_CMD_TEST;
-						testExprType = 1;
+						cmdState = CmdState::Test;
+						testExprType = TestExprType::DoubleBracket;
 						sc.Forward();
 					} else if (sc.ch == '[' && IsASpace(sc.chNext)) {
-						cmdState = BASH_CMD_TEST;
-						testExprType = 2;
+						cmdState = CmdState::Test;
+						testExprType = TestExprType::SingleBracket;
 					}
 				}
 				// special state -- for ((x;y;z)) in ... looping
-				if (cmdState == BASH_CMD_WORD && sc.Match('(', '(')) {
-					cmdState = BASH_CMD_ARITH;
-					sc.Forward();
+				if (cmdState == CmdState::Word && sc.Match('(', '(')) {
+					cmdState = CmdState::Arithmetic;
+					sc.Forward(2);
 					continue;
 				}
-				// handle command delimiters in command START|BODY|WORD state, also TEST if 'test'
-				if (cmdState == BASH_CMD_START
-				 || cmdState == BASH_CMD_BODY
-				 || cmdState == BASH_CMD_WORD
-				 || (cmdState == BASH_CMD_TEST && testExprType == 0)) {
+				// handle command delimiters in command Start|Body|Word state, also Test if 'test'
+				if (cmdState == CmdState::Start
+				 || cmdState == CmdState::Body
+				 || cmdState == CmdState::Word
+				 || (cmdState == CmdState::Test && testExprType == TestExprType::Test)) {
+					char s[10];
 					s[0] = static_cast<char>(sc.ch);
 					if (setBashOperator.Contains(sc.chNext)) {
 						s[1] = static_cast<char>(sc.chNext);
@@ -971,27 +1070,30 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 						isCmdDelim = cmdDelimiter.InList(s);
 					}
 					if (isCmdDelim) {
-						cmdState = BASH_CMD_DELIM;
+						cmdState = CmdState::Delimiter;
+						sc.Forward();
 						continue;
 					}
 				}
 				// handle closing delimiters for test/arithmetic expressions - )),]],]
-				if (cmdState == BASH_CMD_ARITH && sc.Match(')', ')')) {
-					cmdState = BASH_CMD_BODY;
+				if (cmdState == CmdState::Arithmetic && sc.Match(')', ')')) {
+					cmdState = CmdState::Body;
 					sc.Forward();
-				} else if (cmdState == BASH_CMD_TEST && IsASpace(sc.chPrev)) {
-					if (sc.Match(']', ']') && testExprType == 1) {
+				} else if (cmdState == CmdState::Test && IsASpace(sc.chPrev)) {
+					if (sc.Match(']', ']') && testExprType == TestExprType::DoubleBracket) {
 						sc.Forward();
-						cmdState = BASH_CMD_BODY;
-					} else if (sc.ch == ']' && testExprType == 2) {
-						cmdState = BASH_CMD_BODY;
+						cmdState = CmdState::Body;
+					} else if (sc.ch == ']' && testExprType == TestExprType::SingleBracket) {
+						cmdState = CmdState::Body;
 					}
 				}
 			}
 		}// sc.state
+
+		sc.Forward();
 	}
 	sc.Complete();
-	if (sc.state == SCE_SH_HERE_Q) {
+	if (MaskCommand(sc.state) == SCE_SH_HERE_Q) {
 		styler.ChangeLexerState(sc.currentPos, styler.Length());
 	}
 	sc.Complete();
@@ -1003,22 +1105,22 @@ void SCI_METHOD LexerBash::Fold(Sci_PositionU startPos, Sci_Position length, int
 
 	LexAccessor styler(pAccess);
 
-	Sci_PositionU endPos = startPos + length;
+	const Sci_PositionU endPos = startPos + length;
 	int visibleChars = 0;
 	int skipHereCh = 0;
 	Sci_Position lineCurrent = styler.GetLine(startPos);
 	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
 	int levelCurrent = levelPrev;
 	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
+	int styleNext = MaskCommand(styler.StyleIndexAt(startPos));
 	char word[8] = { '\0' }; // we're not interested in long words anyway
 	unsigned int wordlen = 0;
 	for (Sci_PositionU i = startPos; i < endPos; i++) {
-		char ch = chNext;
+		const char ch = chNext;
 		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		const int style = styleNext;
+		styleNext = MaskCommand(styler.StyleIndexAt(i + 1));
+		const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
 		// Comment folding
 		if (options.foldComment && atEOL && IsCommentLine(lineCurrent, styler))
 		{
@@ -1082,7 +1184,7 @@ void SCI_METHOD LexerBash::Fold(Sci_PositionU startPos, Sci_Position length, int
 			visibleChars++;
 	}
 	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	const int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
 	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
 }
 
diff --git a/lexilla/lexers/LexBatch.cxx b/lexilla/lexers/LexBatch.cxx
index afd8c041d990..225465cf097c 100644
--- a/lexilla/lexers/LexBatch.cxx
+++ b/lexilla/lexers/LexBatch.cxx
@@ -5,12 +5,12 @@
 // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+#include <cstdarg>
 
 #include <string>
 #include <string_view>
@@ -79,7 +79,7 @@ bool textQuoted(const char *lineBuffer, Sci_PositionU endPos) {
 	const size_t strLength = strlen(strQuotes);
 	for (size_t i = 0; i < strLength; i++) {
 		const char *pQuote = strchr(strBuffer, strQuotes[i]);
-		while (pQuote != NULL)
+		while (pQuote)
 		{
 			if (!IsEscaped(strBuffer, pQuote - strBuffer)) {
 				CurrentStatus = !CurrentStatus;
@@ -159,7 +159,17 @@ void ColouriseBatchDoc(
 					styler.ColourTo(endPos, SCE_BAT_COMMENT);
 				} else {
 					// Colorize Real Label
-					styler.ColourTo(endPos, SCE_BAT_LABEL);
+					// :[\t ]*[^\t &+:<>|]+
+					const char *startLabelName = lineBuffer + offset + 1;
+					const size_t whitespaceLength = strspn(startLabelName, "\t ");
+					// Set of label-terminating characters determined experimentally
+					const char *endLabel = strpbrk(startLabelName + whitespaceLength, "\t &+:<>|");
+					if (endLabel) {
+						styler.ColourTo(startLine + offset + endLabel - startLabelName, SCE_BAT_LABEL);
+						styler.ColourTo(endPos, SCE_BAT_AFTER_LABEL);	// New style
+					} else {
+						styler.ColourTo(endPos, SCE_BAT_LABEL);
+					}
 				}
 				stopLineProcessing=true;
 			// Check for Drive Change (Drive Change is internal command) - return if found
@@ -630,9 +640,9 @@ void ColouriseBatchDoc(
 const char *const batchWordListDesc[] = {
 	"Internal Commands",
 	"External Commands",
-	0
+	nullptr
 };
 
 }
 
-LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc, "batch", 0, batchWordListDesc);
+LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc, "batch", nullptr, batchWordListDesc);
diff --git a/lexilla/lexers/LexCPP.cxx b/lexilla/lexers/LexCPP.cxx
index b6eba27f100d..215e9d325d71 100644
--- a/lexilla/lexers/LexCPP.cxx
+++ b/lexilla/lexers/LexCPP.cxx
@@ -162,7 +162,7 @@ void highlightTaskMarker(StyleContext &sc, LexAccessor &styler,
 
 class EscapeSequence {
 	const CharacterSet setHexDigits = CharacterSet(CharacterSet::setDigits, "ABCDEFabcdef");
-	const CharacterSet setOctDigits = CharacterSet(CharacterSet::setNone, "01234567");
+	const CharacterSet setOctDigits = CharacterSet("01234567");
 	const CharacterSet setNoneNumeric;
 	const CharacterSet *escapeSetValid = nullptr;
 	int digitsLeft = 0;
@@ -537,11 +537,11 @@ class LexerCPP : public ILexer5 {
 	explicit LexerCPP(bool caseSensitive_) :
 		caseSensitive(caseSensitive_),
 		setWord(CharacterSet::setAlphaNum, "._", true),
-		setNegationOp(CharacterSet::setNone, "!"),
-		setAddOp(CharacterSet::setNone, "+-"),
-		setMultOp(CharacterSet::setNone, "*/%"),
-		setRelOp(CharacterSet::setNone, "=!<>"),
-		setLogicalOp(CharacterSet::setNone, "|&"),
+		setNegationOp("!"),
+		setAddOp("+-"),
+		setMultOp("*/%"),
+		setRelOp("=!<>"),
+		setLogicalOp("|&"),
 		subStyles(styleSubable, 0x80, 0x40, inactiveFlag) {
 	}
 	// Deleted so LexerCPP objects can not be copied.
@@ -770,14 +770,14 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 	const StyleContext::Transform transform = caseSensitive ?
 		StyleContext::Transform::none : StyleContext::Transform::lower;
 
-	const CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-");
-	const CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
+	const CharacterSet setOKBeforeRE("([{=,:;!%^&*|?~+-");
+	const CharacterSet setCouldBePostOp("+-");
 
 	const CharacterSet setDoxygen(CharacterSet::setAlpha, "$@\\&<>#{}[]");
 
 	setWordStart = CharacterSet(CharacterSet::setAlpha, "_", true);
 
-	const CharacterSet setInvalidRawFirst(CharacterSet::setNone, " )\\\t\v\f\n");
+	const CharacterSet setInvalidRawFirst(" )\\\t\v\f\n");
 
 	if (options.identifiersAllowDollars) {
 		setWordStart.Add('$');
diff --git a/lexilla/lexers/LexFSharp.cxx b/lexilla/lexers/LexFSharp.cxx
index d469fc7f6ca3..dfac0286e2cc 100644
--- a/lexilla/lexers/LexFSharp.cxx
+++ b/lexilla/lexers/LexFSharp.cxx
@@ -84,12 +84,15 @@ struct OptionSetFSharp : public OptionSet<OptionsFSharp> {
 
 struct FSharpString {
 	Sci_Position startPos = INVALID_POSITION;
-	int startChar = '"';
+	int startChar = '"', nextChar = '\0';
 	constexpr bool HasLength() const {
 		return startPos > INVALID_POSITION;
 	}
 	constexpr bool CanInterpolate() const {
-		return startChar == '$';
+		return startChar == '$' || (startChar == '@' && nextChar == '$');
+	}
+	constexpr bool IsVerbatim() const {
+		return startChar == '@' || (startChar == '$' && nextChar == '@');
 	}
 };
 
@@ -207,8 +210,9 @@ inline bool MatchQuotedExpressionEnd(const StyleContext &cxt) {
 	return (cxt.ch == '>' && cxt.chPrev == '@');
 }
 
-inline bool MatchStringStart(const StyleContext &cxt) {
-	return (cxt.ch == '"' || cxt.Match('@', '"') || cxt.Match('$', '"') || cxt.Match('`', '`'));
+inline bool MatchStringStart(StyleContext &cxt) {
+	return (cxt.ch == '"' || cxt.Match("@\"") || cxt.Match("$\"") || cxt.Match("@$\"") || cxt.Match("$@\"") ||
+		cxt.Match("``"));
 }
 
 inline bool FollowsEscapedBackslash(StyleContext &cxt) {
@@ -223,21 +227,21 @@ inline bool MatchStringEnd(StyleContext &cxt, const FSharpString &fsStr) {
 		// end of quoted identifier?
 		((cxt.ch == '`' && cxt.chPrev == '`') ||
 		// end of literal or interpolated triple-quoted string?
-		 ((fsStr.startChar == '"' || (fsStr.CanInterpolate() && cxt.chPrev != '$')) &&
+		 ((fsStr.startChar == '"' || (fsStr.CanInterpolate() && !(fsStr.IsVerbatim() || cxt.chPrev == '$'))) &&
 		  cxt.MatchIgnoreCase("\"\"\"")) ||
 		// end of verbatim string?
-		(fsStr.startChar == '@' &&
+		(fsStr.IsVerbatim() &&
 			// embedded quotes must be in pairs
 			cxt.ch == '"' && cxt.chNext != '"' &&
-			(cxt.chPrev != '"' || (cxt.chPrev == '"' &&
+			(cxt.chPrev != '"' ||
 				// empty verbatim string?
-				(cxt.GetRelative(-2) == '@' ||
+				((cxt.GetRelative(-2) == '@' || cxt.GetRelative(-2) == '$') ||
 				// pair of quotes at end of string?
-				(cxt.GetRelative(-2) == '"' && cxt.GetRelative(-3) != '@'))))))) ||
+				(cxt.GetRelative(-2) == '"' && !(cxt.GetRelative(-3) == '@' || cxt.GetRelative(-3) == '$'))))))) ||
 		(!fsStr.HasLength() && cxt.ch == '"' &&
 			((cxt.chPrev != '\\' || (cxt.GetRelative(-2) == '\\' && !FollowsEscapedBackslash(cxt))) ||
 			// treat backslashes as char literals in verbatim strings
-			(fsStr.startChar == '@' && cxt.chPrev == '\\')));
+			(fsStr.IsVerbatim() && cxt.chPrev == '\\')));
 }
 
 inline bool MatchCharacterStart(StyleContext &cxt) {
@@ -251,8 +255,8 @@ inline bool CanEmbedQuotes(StyleContext &cxt) {
 	// - https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/strings
 	// - https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/interpolated-strings#syntax
 	// - https://fsharp.org/specs/language-spec/4.1/FSharpSpec-4.1-latest.pdf#page=25&zoom=auto,-98,600
-	return cxt.MatchIgnoreCase("$\"\"\"") || cxt.MatchIgnoreCase("\"\"\"") || cxt.Match('@', '"') ||
-	       cxt.Match('`', '`');
+	return cxt.Match("$\"\"\"") || cxt.Match("\"\"\"") || cxt.Match("@$\"\"\"") || cxt.Match("$@\"\"\"") ||
+	       cxt.Match('@', '"') || cxt.Match('`', '`');
 }
 
 inline bool IsLineEnd(StyleContext &cxt, const Sci_Position offset) {
@@ -407,6 +411,7 @@ void SCI_METHOD LexerFSharp::Lex(Sci_PositionU start, Sci_Position length, int i
 					state = SCE_FSHARP_CHARACTER;
 				} else if (MatchStringStart(sc)) {
 					fsStr.startChar = sc.ch;
+					fsStr.nextChar = sc.chNext;
 					fsStr.startPos = INVALID_POSITION;
 					if (CanEmbedQuotes(sc)) {
 						// double quotes after this position should be non-terminating
@@ -414,7 +419,7 @@ void SCI_METHOD LexerFSharp::Lex(Sci_PositionU start, Sci_Position length, int i
 					}
 					if (sc.ch == '`') {
 						state = SCE_FSHARP_QUOT_IDENTIFIER;
-					} else if (sc.ch == '@') {
+					} else if (fsStr.IsVerbatim()) {
 						state = SCE_FSHARP_VERBATIM;
 					} else {
 						state = SCE_FSHARP_STRING;
@@ -542,7 +547,7 @@ void SCI_METHOD LexerFSharp::Lex(Sci_PositionU start, Sci_Position length, int i
 					} else if (sc.chNext == '}') {
 						isInterpolated = false;
 						sc.Forward();
-						state = SCE_FSHARP_STRING;
+						state = fsStr.IsVerbatim() ? SCE_FSHARP_VERBATIM : SCE_FSHARP_STRING;
 					}
 				} else if (fsStr.CanInterpolate() && sc.ch == '{') {
 					isInterpolated = true;
@@ -607,7 +612,7 @@ void SCI_METHOD LexerFSharp::Lex(Sci_PositionU start, Sci_Position length, int i
 				    !(setFormatFlags.Contains(sc.ch) || IsADigit(sc.ch)) ||
 				    (setFormatFlags.Contains(sc.ch) && sc.ch == sc.chNext))) {
 					colorSpan++;
-					state = (fsStr.startChar == '@') ? SCE_FSHARP_VERBATIM : SCE_FSHARP_STRING;
+					state = fsStr.IsVerbatim() ? SCE_FSHARP_VERBATIM : SCE_FSHARP_STRING;
 				}
 				break;
 		}
diff --git a/lexilla/lexers/LexLua.cxx b/lexilla/lexers/LexLua.cxx
index fc9cef97da38..44a4f345108b 100644
--- a/lexilla/lexers/LexLua.cxx
+++ b/lexilla/lexers/LexLua.cxx
@@ -65,9 +65,9 @@ static void ColouriseLuaDoc(
 	// Not exactly following number definition (several dots are seen as OK, etc.)
 	// but probably enough in most cases. [pP] is for hex floats.
 	CharacterSet setNumber(CharacterSet::setDigits, ".-+abcdefpABCDEFP");
-	CharacterSet setExponent(CharacterSet::setNone, "eEpP");
-	CharacterSet setLuaOperator(CharacterSet::setNone, "*/-+()={}~[];<>,.^%:#&|");
-	CharacterSet setEscapeSkip(CharacterSet::setNone, "\"'\\");
+	CharacterSet setExponent("eEpP");
+	CharacterSet setLuaOperator("*/-+()={}~[];<>,.^%:#&|");
+	CharacterSet setEscapeSkip("\"'\\");
 
 	Sci_Position currentLine = styler.GetLine(startPos);
 	// Initialize long string [[ ... ]] or block comment --[[ ... ]],
diff --git a/lexilla/lexers/LexVB.cxx b/lexilla/lexers/LexVB.cxx
index eca3497bb2c8..15156fe8c93c 100644
--- a/lexilla/lexers/LexVB.cxx
+++ b/lexilla/lexers/LexVB.cxx
@@ -72,6 +72,10 @@ static void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int init
 	int visibleChars = 0;
 	int fileNbDigits = 0;
 
+	// property lexer.vb.strings.multiline
+	//  Set to 1 to allow strings to continue over line ends.
+	bool allowMultilineStr = styler.GetPropertyInt("lexer.vb.strings.multiline", 0) != 0;
+
 	// Do not leak onto next line
 	if (initStyle == SCE_B_STRINGEOL || initStyle == SCE_B_COMMENT || initStyle == SCE_B_PREPROCESSOR) {
 		initStyle = SCE_B_DEFAULT;
@@ -134,7 +138,7 @@ static void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int init
 					}
 					sc.ForwardSetState(SCE_B_DEFAULT);
 				}
-			} else if (sc.atLineEnd) {
+			} else if (sc.atLineEnd && !allowMultilineStr) {
 				visibleChars = 0;
 				sc.ChangeState(SCE_B_STRINGEOL);
 				sc.ForwardSetState(SCE_B_DEFAULT);
diff --git a/lexilla/lexlib/CharacterSet.h b/lexilla/lexlib/CharacterSet.h
index cc197ac649bd..848dc1d4443a 100644
--- a/lexilla/lexlib/CharacterSet.h
+++ b/lexilla/lexlib/CharacterSet.h
@@ -33,6 +33,9 @@ class CharacterSetArray {
 		if (base & setDigits)
 			AddString("0123456789");
 	}
+	CharacterSetArray(const char *initialSet, bool valueAfter_=false) noexcept :
+		CharacterSetArray(setNone, initialSet, valueAfter_) {
+	}
 	// For compatibility with previous version but should not be used in new code.
 	CharacterSetArray(setBase base, const char *initialSet, [[maybe_unused]]int size_, bool valueAfter_=false) noexcept :
 		CharacterSetArray(base, initialSet, valueAfter_) {
diff --git a/lexilla/lexlib/DefaultLexer.cxx b/lexilla/lexlib/DefaultLexer.cxx
index 991dc34f7ea1..d84062d9a1d9 100644
--- a/lexilla/lexlib/DefaultLexer.cxx
+++ b/lexilla/lexlib/DefaultLexer.cxx
@@ -35,8 +35,7 @@ DefaultLexer::DefaultLexer(const char *languageName_, int language_,
 	nClasses(nClasses_) {
 }
 
-DefaultLexer::~DefaultLexer() {
-}
+DefaultLexer::~DefaultLexer() = default;
 
 void SCI_METHOD DefaultLexer::Release() {
 	delete this;
diff --git a/lexilla/lexlib/LexerModule.cxx b/lexilla/lexlib/LexerModule.cxx
index 4b550f6bb9ba..9846676a1774 100644
--- a/lexilla/lexlib/LexerModule.cxx
+++ b/lexilla/lexlib/LexerModule.cxx
@@ -116,7 +116,7 @@ void LexerModule::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initS
 			startPos = newStartPos;
 			initStyle = 0;
 			if (startPos > 0) {
-				initStyle = styler.StyleAt(startPos - 1);
+				initStyle = styler.StyleIndexAt(startPos - 1);
 			}
 		}
 		fnFolder(startPos, lengthDoc, initStyle, keywordlists, styler);
diff --git a/lexilla/lexlib/PropSetSimple.cxx b/lexilla/lexlib/PropSetSimple.cxx
index b6c4166f4fdf..09648fddca84 100644
--- a/lexilla/lexlib/PropSetSimple.cxx
+++ b/lexilla/lexlib/PropSetSimple.cxx
@@ -22,7 +22,7 @@ using namespace Lexilla;
 
 namespace {
 
-typedef std::map<std::string, std::string, std::less<>> mapss;
+using mapss = std::map<std::string, std::string, std::less<>>;
 
 mapss *PropsFromPointer(void *impl) noexcept {
 	return static_cast<mapss *>(impl);
@@ -45,7 +45,7 @@ bool PropSetSimple::Set(std::string_view key, std::string_view val) {
 	mapss *props = PropsFromPointer(impl);
 	if (!props)
 		return false;
-	mapss::iterator it = props->find(key);
+	mapss::iterator const it = props->find(key);
 	if (it != props->end()) {
 		if (val == it->second)
 			return false;
@@ -59,7 +59,7 @@ bool PropSetSimple::Set(std::string_view key, std::string_view val) {
 const char *PropSetSimple::Get(std::string_view key) const {
 	mapss *props = PropsFromPointer(impl);
 	if (props) {
-		mapss::const_iterator keyPos = props->find(key);
+		mapss::const_iterator const keyPos = props->find(key);
 		if (keyPos != props->end()) {
 			return keyPos->second.c_str();
 		}
diff --git a/lexilla/lexlib/WordList.cxx b/lexilla/lexlib/WordList.cxx
index 2d95aa660bf1..5cab08142a16 100644
--- a/lexilla/lexlib/WordList.cxx
+++ b/lexilla/lexlib/WordList.cxx
@@ -134,7 +134,7 @@ bool WordList::Set(const char *s) {
 	len = lenTemp;
 	std::fill(starts, std::end(starts), -1);
 	for (int l = static_cast<int>(len - 1); l >= 0; l--) {
-		unsigned char indexChar = words[l][0];
+		unsigned char const indexChar = words[l][0];
 		starts[indexChar] = l;
 	}
 	return true;
diff --git a/lexilla/scripts/LexillaData.py b/lexilla/scripts/LexillaData.py
index 0e875bd03a95..7a10230e9a75 100644
--- a/lexilla/scripts/LexillaData.py
+++ b/lexilla/scripts/LexillaData.py
@@ -41,24 +41,24 @@
 
 import FileGenerator
 
-neutralEncoding = "cp437"	# Each byte value is valid in cp437
+neutralEncoding = "iso-8859-1"	# Each byte value is valid in iso-8859-1
 
 def FindModules(lexFile):
     modules = []
     partLine = ""
     with lexFile.open(encoding=neutralEncoding) as f:
         lineNum = 0
-        for l in f.readlines():
+        for line in f.readlines():
             lineNum += 1
-            l = l.rstrip()
-            if partLine or l.startswith("LexerModule"):
-                if ")" in l:
-                    l = partLine + l
-                    original = l
-                    l = l.replace("(", " ")
-                    l = l.replace(")", " ")
-                    l = l.replace(",", " ")
-                    parts = l.split()
+            line = line.rstrip()
+            if partLine or line.startswith("LexerModule"):
+                if ")" in line:
+                    line = partLine + line
+                    original = line
+                    line = line.replace("(", " ")
+                    line = line.replace(")", " ")
+                    line = line.replace(",", " ")
+                    parts = line.split()
                     lexerName = parts[4]
                     if not (lexerName.startswith('"') and lexerName.endswith('"')):
                         print(f"{lexFile}:{lineNum}: Bad LexerModule statement:\n{original}")
@@ -67,7 +67,7 @@ def FindModules(lexFile):
                     modules.append([parts[1], parts[2], lexerName])
                     partLine = ""
                 else:
-                    partLine = partLine + l
+                    partLine = partLine + line
     return modules
 
 def FindLexersInXcode(xCodeProject):
@@ -113,11 +113,11 @@ def FindLexersInXcode(xCodeProject):
 def FindProperties(lexFile):
     properties = {}
     with open(lexFile, encoding=neutralEncoding) as f:
-        for l in f.readlines():
-            if ("GetProperty" in l or "DefineProperty" in l) and "\"" in l:
-                l = l.strip()
-                if not l.startswith("//"):	# Drop comments
-                    propertyName = l.split("\"")[1]
+        for s in f.readlines():
+            if ("GetProperty" in s or "DefineProperty" in s) and "\"" in s:
+                s = s.strip()
+                if not s.startswith("//"):	# Drop comments
+                    propertyName = s.split("\"")[1]
                     if propertyName.lower() == propertyName:
                         # Only allow lower case property names
                         if propertyName in knownIrregularProperties or \
@@ -130,36 +130,36 @@ def FindPropertyDocumentation(lexFile):
     documents = {}
     with lexFile.open(encoding=neutralEncoding) as f:
         name = ""
-        for l in f.readlines():
-            l = l.strip()
-            if "// property " in l:
-                propertyName = l.split()[2]
+        for line in f.readlines():
+            line = line.strip()
+            if "// property " in line:
+                propertyName = line.split()[2]
                 if propertyName.lower() == propertyName:
                     # Only allow lower case property names
                     name = propertyName
                     documents[name] = ""
-            elif "DefineProperty" in l and "\"" in l:
-                propertyName = l.split("\"")[1]
+            elif "DefineProperty" in line and "\"" in line:
+                propertyName = line.split("\"")[1]
                 if propertyName.lower() == propertyName:
                     # Only allow lower case property names
                     name = propertyName
                     documents[name] = ""
             elif name:
-                if l.startswith("//"):
+                if line.startswith("//"):
                     if documents[name]:
                         documents[name] += " "
-                    documents[name] += l[2:].strip()
-                elif l.startswith("\""):
-                    l = l[1:].strip()
-                    if l.endswith(";"):
-                        l = l[:-1].strip()
-                    if l.endswith(")"):
-                        l = l[:-1].strip()
-                    if l.endswith("\""):
-                        l = l[:-1]
+                    documents[name] += line[2:].strip()
+                elif line.startswith("\""):
+                    line = line[1:].strip()
+                    if line.endswith(";"):
+                        line = line[:-1].strip()
+                    if line.endswith(")"):
+                        line = line[:-1].strip()
+                    if line.endswith("\""):
+                        line = line[:-1]
                     # Fix escaped double quotes
-                    l = l.replace("\\\"", "\"")
-                    documents[name] += l
+                    line = line.replace("\\\"", "\"")
+                    documents[name] += line
                 else:
                     name = ""
     for name in list(documents.keys()):
@@ -171,15 +171,15 @@ def FindCredits(historyFile):
     credits = []
     stage = 0
     with historyFile.open(encoding="utf-8") as f:
-        for l in f.readlines():
-            l = l.strip()
-            if stage == 0 and l == "<table>":
+        for line in f.readlines():
+            line = line.strip()
+            if stage == 0 and line == "<table>":
                 stage = 1
-            elif stage == 1 and l == "</table>":
+            elif stage == 1 and line == "</table>":
                 stage = 2
-            if stage == 1 and l.startswith("<td>"):
-                credit = l[4:-5]
-                if "<a" in l:
+            if stage == 1 and line.startswith("<td>"):
+                credit = line[4:-5]
+                if "<a" in line:
                     title, a, rest = credit.partition("<a href=")
                     urlplus, _bracket, end = rest.partition(">")
                     name = end.split("<")[0]
@@ -194,19 +194,19 @@ def FindCredits(historyFile):
 def ciKey(a):
     return str(a).lower()
 
-def SortListInsensitive(l):
-    l.sort(key=ciKey)
+def SortListInsensitive(list):
+    list.sort(key=ciKey)
 
 class LexillaData:
     def __init__(self, scintillaRoot):
         # Discover version information
         self.version = (scintillaRoot / "version.txt").read_text().strip()
-        self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \
-            self.version[2]
+        self.versionDotted = self.version[0:-2] + '.' + self.version[-2] + '.' + \
+            self.version[-1]
         self.versionCommad = self.versionDotted.replace(".", ", ") + ', 0'
 
         with (scintillaRoot / "doc" / "Lexilla.html").open() as f:
-            self.dateModified = [l for l in f.readlines() if "Date.Modified" in l]\
+            self.dateModified = [d for d in f.readlines() if "Date.Modified" in d]\
                 [0].split('\"')[3]
             # 20130602
             # Lexilla.html
diff --git a/lexilla/scripts/LexillaGen.py b/lexilla/scripts/LexillaGen.py
index 329ce198930e..256c854482a0 100644
--- a/lexilla/scripts/LexillaGen.py
+++ b/lexilla/scripts/LexillaGen.py
@@ -105,7 +105,7 @@ def RegenerateAll(rootDirectory):
 
     # Discover version information
     version = (lexillaDir / "version.txt").read_text().strip()
-    versionDotted = version[0] + '.' + version[1] + '.' + version[2]
+    versionDotted = version[0:-2] + '.' + version[-2] + '.' + version[-1]
     versionCommad = versionDotted.replace(".", ", ") + ', 0'
 
     rcPath = srcDir / "LexillaVersion.rc"
@@ -116,7 +116,7 @@ def RegenerateAll(rootDirectory):
     UpdateLineInFile(docDir / "LexillaDownload.html", "       Release",
         "       Release " + versionDotted)
     ReplaceREInFile(docDir / "LexillaDownload.html",
-        r"/www.scintilla.org/([a-zA-Z]+)\d\d\d",
+        r"/www.scintilla.org/([a-zA-Z]+)\d{3,5}",
         r"/www.scintilla.org/\g<1>" +  version,
         0)
 
diff --git a/lexilla/src/Lexilla.vcxproj b/lexilla/src/Lexilla.vcxproj
index f47331da9f46..6bc300954f3d 100644
--- a/lexilla/src/Lexilla.vcxproj
+++ b/lexilla/src/Lexilla.vcxproj
@@ -101,7 +101,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <CETCompat>true</CETCompat>
       <ModuleDefinitionFile>Lexilla.def</ModuleDefinitionFile>
     </Link>
diff --git a/lexilla/src/Lexilla/Info.plist b/lexilla/src/Lexilla/Info.plist
index 7e4119fc72ac..48328ee167f0 100644
--- a/lexilla/src/Lexilla/Info.plist
+++ b/lexilla/src/Lexilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.4</string>
+	<string>5.2.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
index ed40fc7cd3f5..21d34b25adeb 100644
--- a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
+++ b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
@@ -853,7 +853,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.2.4;
+				CURRENT_PROJECT_VERSION = 5.2.5;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -880,7 +880,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.2.4;
+				CURRENT_PROJECT_VERSION = 5.2.5;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/lexilla/src/LexillaVersion.rc b/lexilla/src/LexillaVersion.rc
index 7a81b63d4d0b..a17c947c2b51 100644
--- a/lexilla/src/LexillaVersion.rc
+++ b/lexilla/src/LexillaVersion.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_LEXILLA "5.2.4"
-#define VERSION_WORDS 5, 2, 4, 0
+#define VERSION_LEXILLA "5.2.5"
+#define VERSION_WORDS 5, 2, 5, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/lexilla/src/makefile b/lexilla/src/makefile
index fc14bafba37e..fc9c85a940b6 100644
--- a/lexilla/src/makefile
+++ b/lexilla/src/makefile
@@ -131,8 +131,12 @@ $(LEXILLA): $(LEXILLA_OBJS) $(VERSION_RESOURCE)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
 
 $(LIBLEXILLA):  $(LEXILLA_OBJS)
+ifeq ($(SHAREDEXTENSION),dylib)
+	libtool -static -o $@ $^
+else
 	$(AR) rc $@ $^
 	$(RANLIB) $@
+endif
 
 # Automatically generate dependencies for most files with "make deps"
 include deps.mak
diff --git a/lexilla/test/TestLexers.cxx b/lexilla/test/TestLexers.cxx
index 5bee845bc52d..da78b6dc9ef3 100644
--- a/lexilla/test/TestLexers.cxx
+++ b/lexilla/test/TestLexers.cxx
@@ -885,9 +885,10 @@ bool TestFile(const std::filesystem::path &path, const PropertyMap &propertyMap)
 	}
 
 	if (propertyMap.GetPropertyValue("testlexers.list.styles").value_or(0)) {
-		std::vector<bool> used(0x80);
+		std::vector<bool> used(0x100);
 		for (Sci_Position pos = 0; pos < pdoc->Length(); pos++) {
-			const unsigned style = pdoc->StyleAt(pos);
+			const unsigned char uchStyle = pdoc->StyleAt(pos);
+			const unsigned style = uchStyle;
 			used.at(style) = true;
 		}
 		PrintRanges(used);
diff --git a/lexilla/test/examples/bash/AllStyles.bsh b/lexilla/test/examples/bash/AllStyles.bsh
new file mode 100644
index 000000000000..0f01b520d095
--- /dev/null
+++ b/lexilla/test/examples/bash/AllStyles.bsh
@@ -0,0 +1,60 @@
+# Enumerate all styles: 0 to 13
+
+# comment=2
+
+# whitespace=0
+	# w
+
+# error=1
+0#0000
+
+# number=3
+123
+
+# keyword=4
+set
+
+# double-quoted-string=5
+"string"
+
+# single-quoted-string=6
+'str'
+
+# operator=7
++
+
+# identifier=8
+identifier
+
+# scalar=9
+$scalar
+$?Status
+
+# parameter-expansion=10
+${parameter}
+
+# back-ticks=11
+`ls`
+
+# here-doc-delimiter=12, here-doc=13
+<<EOF
+  Here-doc.
+EOF
+
+# other quoted types are mapped to current classes
+
+# double-quoted-string=5
+$"string"
+$'str'
+
+# back-ticks=11
+$`ls`
+$(ls)
+
+# Use substyles
+
+# Substyled identifier=128
+map
+
+# Substyled scalar=129
+$CWD
diff --git a/lexilla/test/examples/bash/AllStyles.bsh.folded b/lexilla/test/examples/bash/AllStyles.bsh.folded
new file mode 100644
index 000000000000..afa4000f7f7b
--- /dev/null
+++ b/lexilla/test/examples/bash/AllStyles.bsh.folded
@@ -0,0 +1,61 @@
+ 0 400   0   # Enumerate all styles: 0 to 13
+ 1 400   0   
+ 0 400   0   # comment=2
+ 1 400   0   
+ 2 400   0 + # whitespace=0
+ 0 401   0 | 	# w
+ 1 400   0   
+ 0 400   0   # error=1
+ 0 400   0   0#0000
+ 1 400   0   
+ 0 400   0   # number=3
+ 0 400   0   123
+ 1 400   0   
+ 0 400   0   # keyword=4
+ 0 400   0   set
+ 1 400   0   
+ 0 400   0   # double-quoted-string=5
+ 0 400   0   "string"
+ 1 400   0   
+ 0 400   0   # single-quoted-string=6
+ 0 400   0   'str'
+ 1 400   0   
+ 0 400   0   # operator=7
+ 0 400   0   +
+ 1 400   0   
+ 0 400   0   # identifier=8
+ 0 400   0   identifier
+ 1 400   0   
+ 0 400   0   # scalar=9
+ 0 400   0   $scalar
+ 0 400   0   $?Status
+ 1 400   0   
+ 0 400   0   # parameter-expansion=10
+ 0 400   0   ${parameter}
+ 1 400   0   
+ 0 400   0   # back-ticks=11
+ 0 400   0   `ls`
+ 1 400   0   
+ 0 400   0   # here-doc-delimiter=12, here-doc=13
+ 2 400   0 + <<EOF
+ 0 401   0 |   Here-doc.
+ 0 401   0 | EOF
+ 1 400   0   
+ 0 400   0   # other quoted types are mapped to current classes
+ 1 400   0   
+ 0 400   0   # double-quoted-string=5
+ 0 400   0   $"string"
+ 0 400   0   $'str'
+ 1 400   0   
+ 0 400   0   # back-ticks=11
+ 0 400   0   $`ls`
+ 0 400   0   $(ls)
+ 1 400   0   
+ 0 400   0   # Use substyles
+ 1 400   0   
+ 0 400   0   # Substyled identifier=128
+ 0 400   0   map
+ 1 400   0   
+ 0 400   0   # Substyled scalar=129
+ 0 400   0   $CWD
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/bash/AllStyles.bsh.styled b/lexilla/test/examples/bash/AllStyles.bsh.styled
new file mode 100644
index 000000000000..ba299ef200c5
--- /dev/null
+++ b/lexilla/test/examples/bash/AllStyles.bsh.styled
@@ -0,0 +1,60 @@
+{2}# Enumerate all styles: 0 to 13{0}
+
+{2}# comment=2{0}
+
+{2}# whitespace=0{0}
+	{2}# w{0}
+
+{2}# error=1{0}
+{1}0#0000{0}
+
+{2}# number=3{0}
+{3}123{0}
+
+{2}# keyword=4{0}
+{4}set{0}
+
+{2}# double-quoted-string=5{0}
+{5}"string"{0}
+
+{2}# single-quoted-string=6{0}
+{6}'str'{0}
+
+{2}# operator=7{0}
+{7}+{0}
+
+{2}# identifier=8{0}
+{8}identifier{0}
+
+{2}# scalar=9{0}
+{9}$scalar{0}
+{9}$?{8}Status{0}
+
+{2}# parameter-expansion=10{0}
+{10}${parameter}{0}
+
+{2}# back-ticks=11{0}
+{11}`ls`{0}
+
+{2}# here-doc-delimiter=12, here-doc=13{0}
+{12}<<EOF{13}
+  Here-doc.
+EOF{0}
+
+{2}# other quoted types are mapped to current classes{0}
+
+{2}# double-quoted-string=5{0}
+{5}$"string"{0}
+{5}$'str'{0}
+
+{2}# back-ticks=11{0}
+{11}$`ls`{0}
+{11}$(ls){0}
+
+{2}# Use substyles{0}
+
+{2}# Substyled identifier=128{0}
+{128}map{0}
+
+{2}# Substyled scalar=129{0}
+{129}$CWD{0}
diff --git a/lexilla/test/examples/bash/Nested.bsh b/lexilla/test/examples/bash/Nested.bsh
new file mode 100644
index 000000000000..5495ecc120ed
--- /dev/null
+++ b/lexilla/test/examples/bash/Nested.bsh
@@ -0,0 +1,77 @@
+# Nested elements and other complex cases
+
+# String with backtick inclusion
+"x`ls`"
+# Nested string
+"x`ls "*.c"`"
+# Not terminated at first "
+"x`ls" # "`" #
+
+# String with command inclusion
+"x$(ls)"
+
+# Nested command
+$(ls -la$(ls *.c))
+
+# Check strings and backticks in command
+echo $('ls' "." `ls` $'.' $".")
+
+# $( not terminated by ) if contains unterminated string
+$('x) # ') #
+$("x) # ") #
+$(`x) # `) # Bash doesn't like this
+$($'x) # ') #
+$($"x) # ") #
+
+# Parameter expansion
+var=abcdef
+sub=abc
+rep='& '
+echo ${var/$sub/"${rep}}"} #
+
+# '$' in variable
+echo $$PID
+echo $var${var}
+
+# Here-doc with internal elements
+cat <<EOF
+	$scalar
+	${var}
+	$((1+2))
+	$(pwd)
+	`pwd`
+EOF
+
+# Quoted delimiter treats here-doc as simple string
+cat <<"EOF"
+	$scalar
+	${var}
+	$((1+2))
+	$(pwd)
+	`pwd`
+EOF
+
+# Escaped same as quoted
+cat <<\EOF
+	$scalar
+EOF
+
+# Nesting
+echo "$((1 + 2))" #
+echo "$[1 + 2]" #
+
+# Multiple nesting levels
+$(ls -la$(ls $(c) $'*.c' ` $(${s})`))
+
+# Multi-line
+$(ls |
+more)
+
+$(
+`x`
+"x"
+`ls`
+$'x'
+$"x"
+)
+#end -- checks termination of previous
diff --git a/lexilla/test/examples/bash/Nested.bsh.folded b/lexilla/test/examples/bash/Nested.bsh.folded
new file mode 100644
index 000000000000..815171128083
--- /dev/null
+++ b/lexilla/test/examples/bash/Nested.bsh.folded
@@ -0,0 +1,78 @@
+ 0 400   0   # Nested elements and other complex cases
+ 1 400   0   
+ 0 400   0   # String with backtick inclusion
+ 0 400   0   "x`ls`"
+ 0 400   0   # Nested string
+ 0 400   0   "x`ls "*.c"`"
+ 0 400   0   # Not terminated at first "
+ 0 400   0   "x`ls" # "`" #
+ 1 400   0   
+ 0 400   0   # String with command inclusion
+ 0 400   0   "x$(ls)"
+ 1 400   0   
+ 0 400   0   # Nested command
+ 0 400   0   $(ls -la$(ls *.c))
+ 1 400   0   
+ 0 400   0   # Check strings and backticks in command
+ 0 400   0   echo $('ls' "." `ls` $'.' $".")
+ 1 400   0   
+ 0 400   0   # $( not terminated by ) if contains unterminated string
+ 0 400   0   $('x) # ') #
+ 0 400   0   $("x) # ") #
+ 0 400   0   $(`x) # `) # Bash doesn't like this
+ 0 400   0   $($'x) # ') #
+ 0 400   0   $($"x) # ") #
+ 1 400   0   
+ 0 400   0   # Parameter expansion
+ 0 400   0   var=abcdef
+ 0 400   0   sub=abc
+ 0 400   0   rep='& '
+ 0 400   0   echo ${var/$sub/"${rep}}"} #
+ 1 400   0   
+ 0 400   0   # '$' in variable
+ 0 400   0   echo $$PID
+ 0 400   0   echo $var${var}
+ 1 400   0   
+ 0 400   0   # Here-doc with internal elements
+ 2 400   0 + cat <<EOF
+ 0 401   0 | 	$scalar
+ 0 401   0 | 	${var}
+ 0 401   0 | 	$((1+2))
+ 0 401   0 | 	$(pwd)
+ 0 401   0 | 	`pwd`
+ 0 401   0 | EOF
+ 1 400   0   
+ 0 400   0   # Quoted delimiter treats here-doc as simple string
+ 2 400   0 + cat <<"EOF"
+ 0 401   0 | 	$scalar
+ 0 401   0 | 	${var}
+ 0 401   0 | 	$((1+2))
+ 0 401   0 | 	$(pwd)
+ 0 401   0 | 	`pwd`
+ 0 401   0 | EOF
+ 1 400   0   
+ 0 400   0   # Escaped same as quoted
+ 2 400   0 + cat <<\EOF
+ 0 401   0 | 	$scalar
+ 0 401   0 | EOF
+ 1 400   0   
+ 0 400   0   # Nesting
+ 0 400   0   echo "$((1 + 2))" #
+ 0 400   0   echo "$[1 + 2]" #
+ 1 400   0   
+ 0 400   0   # Multiple nesting levels
+ 0 400   0   $(ls -la$(ls $(c) $'*.c' ` $(${s})`))
+ 1 400   0   
+ 0 400   0   # Multi-line
+ 0 400   0   $(ls |
+ 0 400   0   more)
+ 1 400   0   
+ 0 400   0   $(
+ 0 400   0   `x`
+ 0 400   0   "x"
+ 0 400   0   `ls`
+ 0 400   0   $'x'
+ 0 400   0   $"x"
+ 0 400   0   )
+ 0 400   0   #end -- checks termination of previous
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/bash/Nested.bsh.styled b/lexilla/test/examples/bash/Nested.bsh.styled
new file mode 100644
index 000000000000..10eaf9a5d796
--- /dev/null
+++ b/lexilla/test/examples/bash/Nested.bsh.styled
@@ -0,0 +1,77 @@
+{2}# Nested elements and other complex cases{0}
+
+{2}# String with backtick inclusion{0}
+{5}"x`ls`"{0}
+{2}# Nested string{0}
+{5}"x`ls "*.c"`"{0}
+{2}# Not terminated at first "{0}
+{5}"x`ls" # "`"{0} {2}#{0}
+
+{2}# String with command inclusion{0}
+{5}"x$(ls)"{0}
+
+{2}# Nested command{0}
+{11}$(ls -la$(ls *.c)){0}
+
+{2}# Check strings and backticks in command{0}
+{4}echo{0} {11}$('ls' "." `ls` $'.' $"."){0}
+
+{2}# $( not terminated by ) if contains unterminated string{0}
+{11}$('x) # '){0} {2}#{0}
+{11}$("x) # "){0} {2}#{0}
+{11}$(`x) # `){0} {2}# Bash doesn't like this{0}
+{11}$($'x) # '){0} {2}#{0}
+{11}$($"x) # "){0} {2}#{0}
+
+{2}# Parameter expansion{0}
+{8}var{7}={8}abcdef{0}
+{8}sub{7}={8}abc{0}
+{8}rep{7}={6}'& '{0}
+{4}echo{0} {10}${var/$sub/"${rep}}"}{0} {2}#{0}
+
+{2}# '$' in variable{0}
+{4}echo{0} {9}$${8}PID{0}
+{4}echo{0} {9}$var{10}${var}{0}
+
+{2}# Here-doc with internal elements{0}
+{4}cat{0} {12}<<EOF{13}
+	$scalar
+	${var}
+	$((1+2))
+	$(pwd)
+	`pwd`
+EOF{0}
+
+{2}# Quoted delimiter treats here-doc as simple string{0}
+{4}cat{0} {12}<<"EOF"{13}
+	$scalar
+	${var}
+	$((1+2))
+	$(pwd)
+	`pwd`
+EOF{0}
+
+{2}# Escaped same as quoted{0}
+{4}cat{0} {12}<<\EOF{13}
+	$scalar
+EOF{0}
+
+{2}# Nesting{0}
+{4}echo{0} {5}"$((1 + 2))"{0} {2}#{0}
+{4}echo{0} {5}"$[1 + 2]"{0} {2}#{0}
+
+{2}# Multiple nesting levels{0}
+{11}$(ls -la$(ls $(c) $'*.c' ` $(${s})`)){0}
+
+{2}# Multi-line{0}
+{11}$(ls |
+more){0}
+
+{11}$(
+`x`
+"x"
+`ls`
+$'x'
+$"x"
+){0}
+{2}#end -- checks termination of previous{0}
diff --git a/lexilla/test/examples/bash/NestedRich.bsh b/lexilla/test/examples/bash/NestedRich.bsh
new file mode 100644
index 000000000000..b0139a4289da
--- /dev/null
+++ b/lexilla/test/examples/bash/NestedRich.bsh
@@ -0,0 +1,26 @@
+# Use lexer.bash.command.substitution=2 to style command substitution
+# so that both the scope of the command and the internal structure are visible.
+
+# Nested command
+$(ls -la$(ls *.c))
+
+# Check strings and backticks in command
+echo $('ls' "." `ls` $'.' $".")
+
+PROJECT_DIR=$(rlwrap -S "Enter source path: " -e '' -i -o cat)
+
+# Multiple nesting levels
+$(ls -la$(ls $(c) $'*.c' ` $(${s})`))
+
+# Multi-line
+$(ls |
+more)
+
+$(
+`x`
+"x"
+`ls`
+$'x'
+$"x"
+)
+#end -- checks termination of previous
diff --git a/lexilla/test/examples/bash/NestedRich.bsh.folded b/lexilla/test/examples/bash/NestedRich.bsh.folded
new file mode 100644
index 000000000000..eaaeab8b41a4
--- /dev/null
+++ b/lexilla/test/examples/bash/NestedRich.bsh.folded
@@ -0,0 +1,27 @@
+ 2 400   0 + # Use lexer.bash.command.substitution=2 to style command substitution
+ 0 401   0 | # so that both the scope of the command and the internal structure are visible.
+ 1 400   0   
+ 0 400   0   # Nested command
+ 0 400   0   $(ls -la$(ls *.c))
+ 1 400   0   
+ 0 400   0   # Check strings and backticks in command
+ 0 400   0   echo $('ls' "." `ls` $'.' $".")
+ 1 400   0   
+ 0 400   0   PROJECT_DIR=$(rlwrap -S "Enter source path: " -e '' -i -o cat)
+ 1 400   0   
+ 0 400   0   # Multiple nesting levels
+ 0 400   0   $(ls -la$(ls $(c) $'*.c' ` $(${s})`))
+ 1 400   0   
+ 0 400   0   # Multi-line
+ 0 400   0   $(ls |
+ 0 400   0   more)
+ 1 400   0   
+ 0 400   0   $(
+ 0 400   0   `x`
+ 0 400   0   "x"
+ 0 400   0   `ls`
+ 0 400   0   $'x'
+ 0 400   0   $"x"
+ 0 400   0   )
+ 0 400   0   #end -- checks termination of previous
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/bash/NestedRich.bsh.styled b/lexilla/test/examples/bash/NestedRich.bsh.styled
new file mode 100644
index 000000000000..90c42a571c98
--- /dev/null
+++ b/lexilla/test/examples/bash/NestedRich.bsh.styled
@@ -0,0 +1,26 @@
+{2}# Use lexer.bash.command.substitution=2 to style command substitution{0}
+{2}# so that both the scope of the command and the internal structure are visible.{0}
+
+{2}# Nested command{0}
+{71}$({72}ls{64} {71}-{72}la{71}$({72}ls{64} {71}*.{72}c{71})){0}
+
+{2}# Check strings and backticks in command{0}
+{4}echo{0} {71}$({70}'ls'{64} {69}"."{64} {75}`ls`{64} {69}$'.'{64} {69}$"."{71}){0}
+
+{8}PROJECT_DIR{7}={71}$({72}rlwrap{64} {72}-S{64} {69}"Enter source path: "{64} {72}-e{64} {70}''{64} {71}-{72}i{64} {72}-o{64} {72}cat{71}){0}
+
+{2}# Multiple nesting levels{0}
+{71}$({72}ls{64} {71}-{72}la{71}$({72}ls{64} {71}$({72}c{71}){64} {69}$'*.c'{64} {75}` $(${s})`{71})){0}
+
+{2}# Multi-line{0}
+{71}$({72}ls{64} {71}|{64}
+{72}more{71}){0}
+
+{71}$({64}
+{75}`x`{64}
+{69}"x"{64}
+{75}`ls`{64}
+{69}$'x'{64}
+{69}$"x"{64}
+{71}){0}
+{2}#end -- checks termination of previous{0}
diff --git a/lexilla/test/examples/bash/NestedStyledInside.bsh b/lexilla/test/examples/bash/NestedStyledInside.bsh
new file mode 100644
index 000000000000..5495ecc120ed
--- /dev/null
+++ b/lexilla/test/examples/bash/NestedStyledInside.bsh
@@ -0,0 +1,77 @@
+# Nested elements and other complex cases
+
+# String with backtick inclusion
+"x`ls`"
+# Nested string
+"x`ls "*.c"`"
+# Not terminated at first "
+"x`ls" # "`" #
+
+# String with command inclusion
+"x$(ls)"
+
+# Nested command
+$(ls -la$(ls *.c))
+
+# Check strings and backticks in command
+echo $('ls' "." `ls` $'.' $".")
+
+# $( not terminated by ) if contains unterminated string
+$('x) # ') #
+$("x) # ") #
+$(`x) # `) # Bash doesn't like this
+$($'x) # ') #
+$($"x) # ") #
+
+# Parameter expansion
+var=abcdef
+sub=abc
+rep='& '
+echo ${var/$sub/"${rep}}"} #
+
+# '$' in variable
+echo $$PID
+echo $var${var}
+
+# Here-doc with internal elements
+cat <<EOF
+	$scalar
+	${var}
+	$((1+2))
+	$(pwd)
+	`pwd`
+EOF
+
+# Quoted delimiter treats here-doc as simple string
+cat <<"EOF"
+	$scalar
+	${var}
+	$((1+2))
+	$(pwd)
+	`pwd`
+EOF
+
+# Escaped same as quoted
+cat <<\EOF
+	$scalar
+EOF
+
+# Nesting
+echo "$((1 + 2))" #
+echo "$[1 + 2]" #
+
+# Multiple nesting levels
+$(ls -la$(ls $(c) $'*.c' ` $(${s})`))
+
+# Multi-line
+$(ls |
+more)
+
+$(
+`x`
+"x"
+`ls`
+$'x'
+$"x"
+)
+#end -- checks termination of previous
diff --git a/lexilla/test/examples/bash/NestedStyledInside.bsh.folded b/lexilla/test/examples/bash/NestedStyledInside.bsh.folded
new file mode 100644
index 000000000000..815171128083
--- /dev/null
+++ b/lexilla/test/examples/bash/NestedStyledInside.bsh.folded
@@ -0,0 +1,78 @@
+ 0 400   0   # Nested elements and other complex cases
+ 1 400   0   
+ 0 400   0   # String with backtick inclusion
+ 0 400   0   "x`ls`"
+ 0 400   0   # Nested string
+ 0 400   0   "x`ls "*.c"`"
+ 0 400   0   # Not terminated at first "
+ 0 400   0   "x`ls" # "`" #
+ 1 400   0   
+ 0 400   0   # String with command inclusion
+ 0 400   0   "x$(ls)"
+ 1 400   0   
+ 0 400   0   # Nested command
+ 0 400   0   $(ls -la$(ls *.c))
+ 1 400   0   
+ 0 400   0   # Check strings and backticks in command
+ 0 400   0   echo $('ls' "." `ls` $'.' $".")
+ 1 400   0   
+ 0 400   0   # $( not terminated by ) if contains unterminated string
+ 0 400   0   $('x) # ') #
+ 0 400   0   $("x) # ") #
+ 0 400   0   $(`x) # `) # Bash doesn't like this
+ 0 400   0   $($'x) # ') #
+ 0 400   0   $($"x) # ") #
+ 1 400   0   
+ 0 400   0   # Parameter expansion
+ 0 400   0   var=abcdef
+ 0 400   0   sub=abc
+ 0 400   0   rep='& '
+ 0 400   0   echo ${var/$sub/"${rep}}"} #
+ 1 400   0   
+ 0 400   0   # '$' in variable
+ 0 400   0   echo $$PID
+ 0 400   0   echo $var${var}
+ 1 400   0   
+ 0 400   0   # Here-doc with internal elements
+ 2 400   0 + cat <<EOF
+ 0 401   0 | 	$scalar
+ 0 401   0 | 	${var}
+ 0 401   0 | 	$((1+2))
+ 0 401   0 | 	$(pwd)
+ 0 401   0 | 	`pwd`
+ 0 401   0 | EOF
+ 1 400   0   
+ 0 400   0   # Quoted delimiter treats here-doc as simple string
+ 2 400   0 + cat <<"EOF"
+ 0 401   0 | 	$scalar
+ 0 401   0 | 	${var}
+ 0 401   0 | 	$((1+2))
+ 0 401   0 | 	$(pwd)
+ 0 401   0 | 	`pwd`
+ 0 401   0 | EOF
+ 1 400   0   
+ 0 400   0   # Escaped same as quoted
+ 2 400   0 + cat <<\EOF
+ 0 401   0 | 	$scalar
+ 0 401   0 | EOF
+ 1 400   0   
+ 0 400   0   # Nesting
+ 0 400   0   echo "$((1 + 2))" #
+ 0 400   0   echo "$[1 + 2]" #
+ 1 400   0   
+ 0 400   0   # Multiple nesting levels
+ 0 400   0   $(ls -la$(ls $(c) $'*.c' ` $(${s})`))
+ 1 400   0   
+ 0 400   0   # Multi-line
+ 0 400   0   $(ls |
+ 0 400   0   more)
+ 1 400   0   
+ 0 400   0   $(
+ 0 400   0   `x`
+ 0 400   0   "x"
+ 0 400   0   `ls`
+ 0 400   0   $'x'
+ 0 400   0   $"x"
+ 0 400   0   )
+ 0 400   0   #end -- checks termination of previous
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/bash/NestedStyledInside.bsh.styled b/lexilla/test/examples/bash/NestedStyledInside.bsh.styled
new file mode 100644
index 000000000000..0eaa553fffab
--- /dev/null
+++ b/lexilla/test/examples/bash/NestedStyledInside.bsh.styled
@@ -0,0 +1,77 @@
+{2}# Nested elements and other complex cases{0}
+
+{2}# String with backtick inclusion{0}
+{5}"x{11}`ls`{5}"{0}
+{2}# Nested string{0}
+{5}"x{11}`ls {5}"*.c"{11}`{5}"{0}
+{2}# Not terminated at first "{0}
+{5}"x{11}`ls{5}" # "{11}`{5}"{0} {2}#{0}
+
+{2}# String with command inclusion{0}
+{5}"x{7}$({8}ls{7}){5}"{0}
+
+{2}# Nested command{0}
+{7}$({8}ls{0} {7}-{8}la{7}$({8}ls{0} {7}*.{8}c{7})){0}
+
+{2}# Check strings and backticks in command{0}
+{4}echo{0} {7}$({6}'ls'{0} {5}"."{0} {11}`ls`{0} {5}$'.'{0} {5}$"."{7}){0}
+
+{2}# $( not terminated by ) if contains unterminated string{0}
+{7}$({6}'x) # '{7}){0} {2}#{0}
+{7}$({5}"x) # "{7}){0} {2}#{0}
+{7}$({11}`x) # `{7}){0} {2}# Bash doesn't like this{0}
+{7}$({5}$'x) # '{7}){0} {2}#{0}
+{7}$({5}$"x) # "{7}){0} {2}#{0}
+
+{2}# Parameter expansion{0}
+{8}var{7}={8}abcdef{0}
+{8}sub{7}={8}abc{0}
+{8}rep{7}={6}'& '{0}
+{4}echo{0} {10}${var/{9}$sub{10}/{5}"{10}${rep}{5}}"{10}}{0} {2}#{0}
+
+{2}# '$' in variable{0}
+{4}echo{0} {9}$${8}PID{0}
+{4}echo{0} {9}$var{10}${var}{0}
+
+{2}# Here-doc with internal elements{0}
+{4}cat{0} {12}<<EOF{13}
+	{9}$scalar{13}
+	{10}${var}{13}
+	{7}$(({3}1{7}+{3}2{7})){13}
+	{7}$({8}pwd{7}){13}
+	{11}`pwd`{13}
+EOF{0}
+
+{2}# Quoted delimiter treats here-doc as simple string{0}
+{4}cat{0} {12}<<"EOF"{13}
+	$scalar
+	${var}
+	$((1+2))
+	$(pwd)
+	`pwd`
+EOF{0}
+
+{2}# Escaped same as quoted{0}
+{4}cat{0} {12}<<\EOF{13}
+	$scalar
+EOF{0}
+
+{2}# Nesting{0}
+{4}echo{0} {5}"{7}$(({3}1{0} {7}+{0} {3}2{7})){5}"{0} {2}#{0}
+{4}echo{0} {5}"{7}$[{3}1{0} {7}+{0} {3}2{7}]{5}"{0} {2}#{0}
+
+{2}# Multiple nesting levels{0}
+{7}$({8}ls{0} {7}-{8}la{7}$({8}ls{0} {7}$({8}c{7}){0} {5}$'*.c'{0} {11}` {7}$({10}${s}{7}){11}`{7})){0}
+
+{2}# Multi-line{0}
+{7}$({8}ls{0} {7}|{0}
+{8}more{7}){0}
+
+{7}$({0}
+{11}`x`{0}
+{5}"x"{0}
+{11}`ls`{0}
+{5}$'x'{0}
+{5}$"x"{0}
+{7}){0}
+{2}#end -- checks termination of previous{0}
diff --git a/lexilla/test/examples/bash/SciTE.properties b/lexilla/test/examples/bash/SciTE.properties
index b31e02b0fdd2..6904acf5ebc6 100644
--- a/lexilla/test/examples/bash/SciTE.properties
+++ b/lexilla/test/examples/bash/SciTE.properties
@@ -2,3 +2,25 @@ lexer.*.bsh=bash
 fold=1
 fold.comment=1
 keywords.*.bsh=case cat do done echo else esac exit export fi find for if in set then while
+
+# Can use substyles for identifiers and scalars
+substyles.bash.8=1
+substylewords.8.1.*.bsh=map
+substyles.bash.9=1
+substylewords.9.1.*.bsh=CWD
+
+lexer.bash.styling.inside.string=0
+lexer.bash.styling.inside.backticks=0
+lexer.bash.styling.inside.parameter=0
+lexer.bash.styling.inside.heredoc=0
+lexer.bash.command.substitution=0
+
+match NestedStyledInside.bsh
+	lexer.bash.styling.inside.string=1
+	lexer.bash.styling.inside.backticks=1
+	lexer.bash.styling.inside.parameter=1
+	lexer.bash.styling.inside.heredoc=1
+	lexer.bash.command.substitution=1
+
+match NestedRich.bsh
+	lexer.bash.command.substitution=2
diff --git a/lexilla/test/examples/bash/x.bsh b/lexilla/test/examples/bash/x.bsh
index f11b8ed7643b..a5472217df8f 100644
--- a/lexilla/test/examples/bash/x.bsh
+++ b/lexilla/test/examples/bash/x.bsh
@@ -31,4 +31,9 @@ while read -r f; do
   } >> $OUT_FILE
 done
 
+# Issue 137, should be shift but here-doc was detected
+echo $(( x << END ))
+pwd
+END
+
 INVALID_NUMBER=0#0000
diff --git a/lexilla/test/examples/bash/x.bsh.folded b/lexilla/test/examples/bash/x.bsh.folded
index 2645e2ecffdd..960460bf084e 100644
--- a/lexilla/test/examples/bash/x.bsh.folded
+++ b/lexilla/test/examples/bash/x.bsh.folded
@@ -31,5 +31,10 @@
  0 402   0 |   } >> $OUT_FILE
  0 401   0 | done
  1 400   0   
+ 0 400   0   # Issue 137, should be shift but here-doc was detected
+ 0 400   0   echo $(( x << END ))
+ 0 400   0   pwd
+ 0 400   0   END
+ 1 400   0   
  0 400   0   INVALID_NUMBER=0#0000
  0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/bash/x.bsh.styled b/lexilla/test/examples/bash/x.bsh.styled
index d5acf40c2155..1b21ed81e35f 100644
--- a/lexilla/test/examples/bash/x.bsh.styled
+++ b/lexilla/test/examples/bash/x.bsh.styled
@@ -31,4 +31,9 @@ EOF{0}
   {7}}{0} {7}>>{0} {9}$OUT_FILE{0}
 {4}done{0}
 
+{2}# Issue 137, should be shift but here-doc was detected{0}
+{4}echo{0} {7}$(({0} {8}x{0} {7}<<{0} {8}END{0} {7})){0}
+{8}pwd{0}
+{8}END{0}
+
 {8}INVALID_NUMBER{7}={1}0#0000{0}
diff --git a/lexilla/test/examples/batch/x.bat b/lexilla/test/examples/batch/x.bat
index c7892e5a2bf3..fce636da7d25 100644
--- a/lexilla/test/examples/batch/x.bat
+++ b/lexilla/test/examples/batch/x.bat
@@ -54,6 +54,7 @@ echo %%0
 echo %%%0
 echo %%%%~-abcd
 
+:TEST that after label style works
 :: Bug 2304: "::" comments not recognised when second command on line
 Set /A xxx=%xxx%+1 & :: Increment
 Set /A xxx=%xxx%+1 & ::Increment
diff --git a/lexilla/test/examples/batch/x.bat.folded b/lexilla/test/examples/batch/x.bat.folded
index 533ac6e8856e..612c639b281a 100644
--- a/lexilla/test/examples/batch/x.bat.folded
+++ b/lexilla/test/examples/batch/x.bat.folded
@@ -54,6 +54,7 @@
  0 400   0   echo %%%0
  0 400   0   echo %%%%~-abcd
  0 400   0   
+ 0 400   0   :TEST that after label style works
  0 400   0   :: Bug 2304: "::" comments not recognised when second command on line
  0 400   0   Set /A xxx=%xxx%+1 & :: Increment
  0 400   0   Set /A xxx=%xxx%+1 & ::Increment
diff --git a/lexilla/test/examples/batch/x.bat.styled b/lexilla/test/examples/batch/x.bat.styled
index 0bb29a56dee2..80b4da7ebae0 100644
--- a/lexilla/test/examples/batch/x.bat.styled
+++ b/lexilla/test/examples/batch/x.bat.styled
@@ -54,6 +54,7 @@ rem 'echo' is word=2, 'a' is default=0
 {2}echo{0} %%{6}%0{0}
 {2}echo{0} %%{6}%%~-abcd{0}
 
+{3}:TEST{8} that after label style works
 {1}:: Bug 2304: "::" comments not recognised when second command on line
 {2}Set{0} /A xxx{7}={6}%xxx%{7}+{0}1 {7}&{0} {1}:: Increment
 {2}Set{0} /A xxx{7}={6}%xxx%{7}+{0}1 {7}&{0} {1}::Increment
diff --git a/lexilla/test/examples/fsharp/FmtSpecs.fs b/lexilla/test/examples/fsharp/FmtSpecs.fs
index cedc038c04a4..8570c046553b 100644
--- a/lexilla/test/examples/fsharp/FmtSpecs.fs
+++ b/lexilla/test/examples/fsharp/FmtSpecs.fs
@@ -6,30 +6,46 @@ let x = List.fold (*) 24.5 [ 1.; 2.; 3. ]
 printfn "Speed: %.2f m/s" x
 printfn $"Speed: %.2f{x} m/s"
 printfn $"Speed: {x:f2} m/s"
+printfn $@"Speed: %.2f{x} m/s"
+printfn @$"Speed: {x:f2} m/s"
 
 // expect " 147%"
 printfn """%% increase:% .0F%% over last year""" x
 printfn $"""%% increase:% .0F{x}%% over last year"""
 printfn $"""%% increase:{x / 100.,5:P0} over last year"""
+printfn $@"""%% increase:% .0F{x}%% over last year"""
+printfn @$"""%% increase:{x / 100.,5:P0} over last year"""
 
 // expect "1.5E+002"
 // NB: units should look like text even without a space
 printfn @"Time: %-0.1Esecs" x
 printfn $"Time: %-0.1E{x}secs"
 printfn $"Time: {x:E1}secs"
+printfn $@"Time: %-0.1E{x}secs"
+printfn @$"Time: {x:E1}secs"
 
 // expect "\"         +147\""
 printfn @"""Temp: %+12.3g K""" x
 printfn $"""{'"'}Temp: %+12.3g{x} K{'"'}"""
 printfn $"""{'"'}Temp: {'+',9}{x:g3} K{'"'}"""
+printfn $@"""Temp: %+12.3g{x} K"""
+printfn @$"""Temp: {'+',9}{x:g3} K"""
 
 // Since F# 6.0
 printfn @"%B" 0b1_000_000
 printfn "%B" "\x40"B.[0]
 printfn $"""%B{'\064'B}"""
+printfn $@"""%B{0b1_000_000}"""
+printfn @$"""%B{'\064'B}"""
 
 // These don't work
 printfn ``%.2f`` x
 printfn $"%.2f" x
+printfn $@"%.2f" x
+printfn @$"%.2f" x
 printfn $"%.2f {x}"
+printfn $@"%.2f {x}"
+printfn @$"%.2f {x}"
 printfn $"""%.2f {x}"""
+printfn $@"""%.2f {x}"""
+printfn @$"""%.2f {x}"""
diff --git a/lexilla/test/examples/fsharp/FmtSpecs.fs.folded b/lexilla/test/examples/fsharp/FmtSpecs.fs.folded
index 48bc8588c32a..7d02d3930479 100644
--- a/lexilla/test/examples/fsharp/FmtSpecs.fs.folded
+++ b/lexilla/test/examples/fsharp/FmtSpecs.fs.folded
@@ -6,31 +6,47 @@
  0 400 400   printfn "Speed: %.2f m/s" x
  0 400 400   printfn $"Speed: %.2f{x} m/s"
  0 400 400   printfn $"Speed: {x:f2} m/s"
+ 0 400 400   printfn $@"Speed: %.2f{x} m/s"
+ 0 400 400   printfn @$"Speed: {x:f2} m/s"
  1 400 400   
  0 400 400   // expect " 147%"
  0 400 400   printfn """%% increase:% .0F%% over last year""" x
  0 400 400   printfn $"""%% increase:% .0F{x}%% over last year"""
  0 400 400   printfn $"""%% increase:{x / 100.,5:P0} over last year"""
+ 0 400 400   printfn $@"""%% increase:% .0F{x}%% over last year"""
+ 0 400 400   printfn @$"""%% increase:{x / 100.,5:P0} over last year"""
  1 400 400   
  2 400 401 + // expect "1.5E+002"
  0 401 400 | // NB: units should look like text even without a space
  0 400 400   printfn @"Time: %-0.1Esecs" x
  0 400 400   printfn $"Time: %-0.1E{x}secs"
  0 400 400   printfn $"Time: {x:E1}secs"
+ 0 400 400   printfn $@"Time: %-0.1E{x}secs"
+ 0 400 400   printfn @$"Time: {x:E1}secs"
  1 400 400   
  0 400 400   // expect "\"         +147\""
  0 400 400   printfn @"""Temp: %+12.3g K""" x
  0 400 400   printfn $"""{'"'}Temp: %+12.3g{x} K{'"'}"""
  0 400 400   printfn $"""{'"'}Temp: {'+',9}{x:g3} K{'"'}"""
+ 0 400 400   printfn $@"""Temp: %+12.3g{x} K"""
+ 0 400 400   printfn @$"""Temp: {'+',9}{x:g3} K"""
  1 400 400   
  0 400 400   // Since F# 6.0
  0 400 400   printfn @"%B" 0b1_000_000
  0 400 400   printfn "%B" "\x40"B.[0]
  0 400 400   printfn $"""%B{'\064'B}"""
+ 0 400 400   printfn $@"""%B{0b1_000_000}"""
+ 0 400 400   printfn @$"""%B{'\064'B}"""
  1 400 400   
  0 400 400   // These don't work
  0 400 400   printfn ``%.2f`` x
  0 400 400   printfn $"%.2f" x
+ 0 400 400   printfn $@"%.2f" x
+ 0 400 400   printfn @$"%.2f" x
  0 400 400   printfn $"%.2f {x}"
+ 0 400 400   printfn $@"%.2f {x}"
+ 0 400 400   printfn @$"%.2f {x}"
  0 400 400   printfn $"""%.2f {x}"""
+ 0 400 400   printfn $@"""%.2f {x}"""
+ 0 400 400   printfn @$"""%.2f {x}"""
  1 400 400   
\ No newline at end of file
diff --git a/lexilla/test/examples/fsharp/FmtSpecs.fs.styled b/lexilla/test/examples/fsharp/FmtSpecs.fs.styled
index 7e0499a3a78f..ab3c88577c5e 100644
--- a/lexilla/test/examples/fsharp/FmtSpecs.fs.styled
+++ b/lexilla/test/examples/fsharp/FmtSpecs.fs.styled
@@ -6,30 +6,46 @@
 {2}printfn{0} {15}"Speed: {19}%.2f{15} m/s"{0} {6}x{0}
 {2}printfn{0} {15}$"Speed: {19}%.2f{15}{x} m/s"{0}
 {2}printfn{0} {15}$"Speed: {x{19}:f2{15}} m/s"{0}
+{2}printfn{0} {16}$@"Speed: {19}%.2f{16}{x} m/s"{0}
+{2}printfn{0} {16}@$"Speed: {x{19}:f2{16}} m/s"{0}
 
 {9}// expect " 147%"{0}
 {2}printfn{0} {15}"""{19}%%{15} increase:{19}% .0F%%{15} over last year"""{0} {6}x{0}
 {2}printfn{0} {15}$"""{19}%%{15} increase:{19}% .0F{15}{x}{19}%%{15} over last year"""{0}
 {2}printfn{0} {15}$"""{19}%%{15} increase:{x / 100.{19},5:P0{15}} over last year"""{0}
+{2}printfn{0} {16}$@"""{19}%%{16} increase:{19}% .0F{16}{x}{19}%%{16} over last year"""{0}
+{2}printfn{0} {16}@$"""{19}%%{16} increase:{x / 100.{19},5:P0{16}} over last year"""{0}
 
 {9}// expect "1.5E+002"{0}
 {9}// NB: units should look like text even without a space{0}
 {2}printfn{0} {16}@"Time: {19}%-0.1E{16}secs"{0} {6}x{0}
 {2}printfn{0} {15}$"Time: {19}%-0.1E{15}{x}secs"{0}
 {2}printfn{0} {15}$"Time: {x{19}:E1{15}}secs"{0}
+{2}printfn{0} {16}$@"Time: {19}%-0.1E{16}{x}secs"{0}
+{2}printfn{0} {16}@$"Time: {x{19}:E1{16}}secs"{0}
 
 {9}// expect "\"         +147\""{0}
 {2}printfn{0} {16}@"""Temp: {19}%+12.3g{16} K"""{0} {6}x{0}
 {2}printfn{0} {15}$"""{'"'}Temp: {19}%+12.3g{15}{x} K{'"'}"""{0}
 {2}printfn{0} {15}$"""{'"'}Temp: {'+'{19},9{15}}{x{19}:g3{15}} K{'"'}"""{0}
+{2}printfn{0} {16}$@"""Temp: {19}%+12.3g{16}{x} K"""{0}
+{2}printfn{0} {16}@$"""Temp: {'+'{19},9{16}}{x{19}:g3{16}} K"""{0}
 
 {9}// Since F# 6.0{0}
 {2}printfn{0} {16}@"{19}%B{16}"{0} {13}0b1_000_000{0}
 {2}printfn{0} {15}"{19}%B{15}"{0} {15}"\x40"B{0}.{12}[{13}0{12}]{0}
 {2}printfn{0} {15}$"""{19}%B{15}{'\064'B}"""{0}
+{2}printfn{0} {16}$@"""{19}%B{16}{0b1_000_000}"""{0}
+{2}printfn{0} {16}@$"""{19}%B{16}{'\064'B}"""{0}
 
 {9}// These don't work{0}
 {2}printfn{0} {7}``%.2f``{0} {6}x{0}
 {2}printfn{0} {15}$"%.2f"{0} {6}x{0}
+{2}printfn{0} {16}$@"%.2f"{0} {6}x{0}
+{2}printfn{0} {16}@$"%.2f"{0} {6}x{0}
 {2}printfn{0} {15}$"%.2f {x}"{0}
+{2}printfn{0} {16}$@"%.2f {x}"{0}
+{2}printfn{0} {16}@$"%.2f {x}"{0}
 {2}printfn{0} {15}$"""%.2f {x}"""{0}
+{2}printfn{0} {16}$@"""%.2f {x}"""{0}
+{2}printfn{0} {16}@$"""%.2f {x}"""{0}
diff --git a/lexilla/test/examples/vb/SciTE.properties b/lexilla/test/examples/vb/SciTE.properties
index 54fead3f1905..859e5470dc51 100644
--- a/lexilla/test/examples/vb/SciTE.properties
+++ b/lexilla/test/examples/vb/SciTE.properties
@@ -1,2 +1,3 @@
 lexer.*.vb=vb
+lexer.vb.strings.multiline=1
 keywords.*.vb=as dim or string
diff --git a/lexilla/test/examples/vb/x.vb b/lexilla/test/examples/vb/x.vb
index a672831a0105..3c28f4e0f83c 100644
--- a/lexilla/test/examples/vb/x.vb
+++ b/lexilla/test/examples/vb/x.vb
@@ -3,6 +3,9 @@ Dim a As String = "hello, world"
 Dim b As String = "hello    world"
 Dim c As String = "Joe said ""Hello"" to me"
 Dim d As String = "\\\\server\\share\\file.txt"
+Dim e As String = "The brown fox
+jumps over
+the lazy dog"
 ' Character
 ""C "c"C "cc"C
 ' Date
diff --git a/lexilla/test/examples/vb/x.vb.folded b/lexilla/test/examples/vb/x.vb.folded
index 82a28069927d..4993ba66541d 100644
--- a/lexilla/test/examples/vb/x.vb.folded
+++ b/lexilla/test/examples/vb/x.vb.folded
@@ -3,6 +3,9 @@
  0 400   0   Dim b As String = "hello    world"
  0 400   0   Dim c As String = "Joe said ""Hello"" to me"
  0 400   0   Dim d As String = "\\\\server\\share\\file.txt"
+ 0 400   0   Dim e As String = "The brown fox
+ 0 400   0   jumps over
+ 0 400   0   the lazy dog"
  0 400   0   ' Character
  0 400   0   ""C "c"C "cc"C
  0 400   0   ' Date
diff --git a/lexilla/test/examples/vb/x.vb.styled b/lexilla/test/examples/vb/x.vb.styled
index 1d19c8ae8381..250bd2fccc7d 100644
--- a/lexilla/test/examples/vb/x.vb.styled
+++ b/lexilla/test/examples/vb/x.vb.styled
@@ -3,6 +3,9 @@
 {3}Dim{0} {7}b{0} {3}As{0} {3}String{0} {6}={0} {4}"hello    world"{0}
 {3}Dim{0} {7}c{0} {3}As{0} {3}String{0} {6}={0} {4}"Joe said ""Hello"" to me"{0}
 {3}Dim{0} {7}d{0} {3}As{0} {3}String{0} {6}={0} {4}"\\\\server\\share\\file.txt"{0}
+{3}Dim{0} {7}e{0} {3}As{0} {3}String{0} {6}={0} {4}"The brown fox
+jumps over
+the lazy dog"{0}
 {1}' Character
 {4}""C{0} {4}"c"C{0} {4}"cc"C{0}
 {1}' Date
diff --git a/lexilla/version.txt b/lexilla/version.txt
index a1a25e0f2395..1fc188de736b 100644
--- a/lexilla/version.txt
+++ b/lexilla/version.txt
@@ -1 +1 @@
-524
\ No newline at end of file
+525
\ No newline at end of file
diff --git a/scintilla/cocoa/Scintilla/Info.plist b/scintilla/cocoa/Scintilla/Info.plist
index 01a7b6b6ebb0..405bddbf8506 100644
--- a/scintilla/cocoa/Scintilla/Info.plist
+++ b/scintilla/cocoa/Scintilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.3.4</string>
+	<string>5.3.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
index 31be524d71e9..d2d436a77826 100644
--- a/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -573,7 +573,8 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.3.4;
+				CURRENT_PROJECT_VERSION = 5.3.5;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -635,7 +636,8 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.3.4;
+				CURRENT_PROJECT_VERSION = 5.3.5;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -665,7 +667,8 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.3.4;
+				CURRENT_PROJECT_VERSION = 5.3.5;
+				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -699,7 +702,8 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.3.4;
+				CURRENT_PROJECT_VERSION = 5.3.5;
+				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/scintilla/cppcheck.suppress b/scintilla/cppcheck.suppress
new file mode 100644
index 000000000000..4d57ed25c274
--- /dev/null
+++ b/scintilla/cppcheck.suppress
@@ -0,0 +1,71 @@
+// File to suppress cppcheck warnings for files that will not be fixed.
+// Does not suppress warnings where an additional occurrence of the warning may be of interest.
+
+// Coding style is to use assignments in constructor when there are many
+// members to initialize or the initialization is complex or has comments.
+useInitializationList
+
+// These may be interesting but its not clear without examining each instance closely
+// Would have to ensure that any_of/all_of has same early/late exits as current code and
+// produces same result on empty collections
+useStlAlgorithm
+
+// Written with variable for consistency
+knownArgument:scintilla/src/SparseVector.h
+
+// The cast converts from 'unsigned char ' to 'char' so isn't unused.
+// Redundant code: Found unused cast of expression 'leadByte'
+constStatement:scintilla/src/Document.cxx
+
+// Some non-explicit constructors are used for conversions or are private to lexers
+noExplicitConstructor
+
+// MarginView access to all bits is safe and is better defined in later versions of C++
+shiftTooManyBitsSigned:scintilla/src/MarginView.cxx
+
+// DLL entry points are unused inside Scintilla
+unusedFunction:scintilla/win32/ScintillaDLL.cxx
+
+// ScintillaDocument is providing an API and there are no consumers of the API inside Scintilla
+unusedFunction:scintilla/qt/ScintillaEdit/ScintillaDocument.cpp
+
+// Doesn't understand changing dropWentOutside in Editor
+knownConditionTrueFalse:scintilla/qt/ScintillaEditBase/ScintillaQt.cpp
+knownConditionTrueFalse:scintilla/win32/ScintillaWin.cxx
+
+// G_DEFINE_TYPE is too complex to pass to cppcheck
+unknownMacro:scintilla/gtk/PlatGTK.cxx
+
+// maskSmooth set depending on preprocessor allowing Wayland definition
+badBitmaskCheck:scintilla/gtk/ScintillaGTK.cxx
+
+// Difficult to test accessibility so don't change
+constVariable:scintilla/gtk/ScintillaGTKAccessible.cxx
+
+// Have no way of testing ScintillaEdit so don't fix even simple warnings
+cstyleCast:scintilla/qt/ScintillaEdit/ScintillaEdit.cpp
+shadowFunction:scintilla/qt/ScintillaEdit/ScintillaEdit.cpp
+
+// cppcheck fails emit from Qt
+shadowFunction:scintilla/qt/ScintillaEditBase/ScintillaQt.cpp
+shadowFunction:scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
+
+// moc_ files show #error as they are not built with standard context
+preprocessorErrorDirective:scintilla/qt/*.cpp
+
+// moc_ files are not understood by cppcheck
+noValidConfiguration
+
+// The performance cost of by-value passing is often small and using a reference decreases
+// code legibility.
+passedByValue
+
+// Suppress everything in catch.hpp as won't be changing
+*:scintilla/test/unit/catch.hpp
+
+// Checks for moves move to variables that are not read but the moved from is checked
+unreadVariable:scintilla/test/unit/*.cxx
+accessMoved:scintilla/test/unit/*.cxx
+
+// cppcheck fails REQUIRE from Catch
+comparisonOfFuncReturningBoolError:scintilla/test/unit/*.cxx
diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html
index eaf5ad8fe032..47a897726dbf 100644
--- a/scintilla/doc/ScintillaDoc.html
+++ b/scintilla/doc/ScintillaDoc.html
@@ -148,10 +148,6 @@ <h1>Scintilla Documentation</h1>
      GTK sample which can be used to find bugs or prototype new features.</a><br />
      <a class="jump" href="Lexer.txt">A detailed description of how to write a lexer, including a
     discussion of folding</a>.<br />
-     <a class="jump" href="http://sphere.sourceforge.net/flik/docs/scintilla-container_lexer.html">
-     How to implement a lexer in the container</a>.<br />
-     <a class="jump" href="http://sphere.sourceforge.net/flik/docs/scintilla-folding.html">
-     How to implement folding</a>.<br />
      <a class="jump" href="https://github.com/geany/geany/files/5204338/Scintilla-var.aq-Tutorial.pdf">
      Beginner's Guide to lexing and folding</a>.<br />
      The <a class="jump" href="SciCoding.html">coding style</a> used in Scintilla and SciTE is
@@ -4883,7 +4879,74 @@ <h2 id="OtherSettings">Other settings</h2>
      A windowed IME <code>SC_IME_WINDOWED</code> (0) may be more similar in appearance and
      behaviour to the IME in other applications.
      An inline IME <code>SC_IME_INLINE</code> (1) may work better with some Scintilla features such as
-     rectangular and multiple selection.</p>
+     rectangular and multiple selection, with IME interactions such as retrieve-surrounding or reconversion feature.</p>
+
+    <table class="standard" summary="IME input method">
+      <caption>IME input method support (O=present, X=absent)</caption>
+      <thead align="left">
+        <tr>
+          <th>IME input method</th>
+          <th>Windows</th>
+          <th>Gtk</th>
+          <th>Qt</th>
+          <th>macOS</th>
+        </tr>
+      </thead>
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_IME_WINDOWED</code></th>
+          <td>O</td>
+          <td>O</td>
+          <td>X</td>
+          <td>X</td>
+        </tr>
+        <tr>
+          <th align="left"><code>SC_IME_INLINE</code></th>
+          <td>O</td>
+          <td>O</td>
+          <td>O</td>
+          <td>O</td>
+       </tr>
+      </tbody>
+    </table>
+    <p></p>
+
+    <table class="standard" summary="IME interaction">
+      <caption>IME interaction support</caption>
+      <thead align="left">
+        <tr>
+          <th>IME interaction</th>
+          <th>Windows</th>
+          <th>Gtk</th>
+          <th>Qt</th>
+          <th>macOS</th>
+        </tr>
+      </thead>
+      <tbody valign="top">
+        <tr>
+          <th align="left">Retrieve Surrounding</th>
+          <td>O</td>
+          <td>O</td>
+          <td>O</td>
+          <td>O</td>
+        </tr>
+        <tr>
+          <th align="left">Reconversion</th>
+          <td>O</td>
+          <td>O</td>
+          <td>O</td>
+          <td>O</td>
+        </tr>
+        <tr>
+          <th align="left">Delete Surrounding</th>
+          <td>O</td>
+          <td>O</td>
+          <td>X</td>
+          <td>O</td>
+        </tr>
+      </tbody>
+    </table>
+
      <p>The windowed behaviour can be chosen with <code>SCI_SETIMEINTERACTION(SC_IME_WINDOWED)</code>
      and the inline behaviour with <code>SCI_SETIMEINTERACTION(SC_IME_INLINE)</code>.
      Scintilla may ignore this call in some cases. For example, the inline behaviour might only be supported for some languages.</p>
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index b04f17fa22e6..1b62792214da 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla534.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla535.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla534.tgz">
+	<a href="https://www.scintilla.org/scintilla535.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.3.4
+       Release 5.3.5
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@ <h4>
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla534.zip">zip format</a> (1.4M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla534.tgz">tgz format</a> (1.3M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla535.zip">zip format</a> (1.4M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla535.tgz">tgz format</a> (1.3M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index aec60799a7b2..632c24a4f308 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -576,9 +576,37 @@ <h2>Contributors</h2>
 	<td>Ferdinand Oeinck</td>
 	<td>Michael Heath</td>
 	<td>Enrico Tröger</td>
+      </tr><tr>
+	<td>Chengzhi Li</td>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla535.zip">Release 5.3.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 May 2023.
+	</li>
+	<li>
+	On Win32, implement IME context sensitivity with IMR_DOCUMENTFEED.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1310/">Feature #1310</a>.
+	</li>
+	<li>
+	On Win32 remove dependence on MSIMG32.DLL  by replacing AlphaBlend
+	by GdiAlphaBlend.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1923/">Bug #1923</a>.
+	</li>
+	<li>
+	On Qt, stop movement of IME candidate box.
+	</li>
+	<li>
+	On Qt, report correct caret position within paragraph for IME retrieve surrounding text.
+	</li>
+	<li>
+	On Qt for Cocoa, fix crash in entry of multi-character strings with IME.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla534.zip">Release 5.3.4</a>
     </h3>
diff --git a/scintilla/doc/ScintillaRelated.html b/scintilla/doc/ScintillaRelated.html
index 8bf1bf452fbc..4b457512eb6f 100644
--- a/scintilla/doc/ScintillaRelated.html
+++ b/scintilla/doc/ScintillaRelated.html
@@ -29,6 +29,10 @@ <h2>
     <h3>
        Ports and Bindings of Scintilla
     </h3>
+    <p>
+	<a href="https://github.com/mneuroth/SciTEQt">SciTEQt</a>
+	is a port of the SciTE editor to the Qt QML/Quick platform.
+    </p>
     <p>
 	<a href="https://orbitalquark.github.io/scinterm">Scinterm</a>
 	is an implementation of Scintilla for the ncurses platform.
@@ -127,6 +131,14 @@ <h3>
     <h3>
        Projects using Scintilla
     </h3>
+    <p>
+	<a href="https://github.com/dail8859/NotepadNext">Notepad Next</a>
+	is a cross-platform reimplementation of Notepad++.
+    </p>
+    <p>
+	<a href="https://github.com/dolphinsmalltalk/Dolphin">Dolphin Smalltalk</a>
+	is an implementation of the Smalltalk language for Windows.
+    </p>
     <p>
 	<a href="https://github.com/simdsoft/x-studio/blob/master/README_EN.md">x-studio</a>
 	is a powerful and very lightweight developer IDE that supports Lua debugging.
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index 7fb04c290ff9..4e57eeefee33 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/doc/index.html
@@ -9,9 +9,16 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20230308" />
+    <meta name="Date.Modified" content="20230531" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
+        .logo {
+            background: url(https://www.scintilla.org/ScintillaLogo.png) no-repeat;
+            background-image: image-set(
+                        url(https://www.scintilla.org/ScintillaLogo.png) 1x,
+                        url(https://www.scintilla.org/ScintillaLogo2x.png) 2x  );
+            height:150px;
+        }
         #versionlist {
             margin: 0;
             padding: .5em;
@@ -48,16 +55,13 @@
   <body bgcolor="#FFFFFF" text="#000000">
     <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
       <tr>
-        <td width="256">
-          <img src="SciWord.jpg" height="78" width="256" alt="Scintilla" />
-        </td>
         <td width="40%" align="left">
           <font color="#FFCC99" size="4"> A free source code editing component for Win32,
           GTK, and macOS</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 5.3.4<br />
-           Site last modified March 8 2023</font>
+          <font color="#FFCC99" size="3"> Release version 5.3.5<br />
+           Site last modified May 31 2023</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -66,18 +70,18 @@
     </table>
     <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
       <tr>
-        <td width="100%" style="background: url(SciBreak.jpg) no-repeat;height:150px;">
+        <td width="100%" class="logo">
           &nbsp;
         </td>
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.3.5 improves IME support on Win32 and Qt.</li>
       <li>Version 5.3.4 adds multithreaded wrapping.</li>
       <li>Version 5.3.3 fixes minor bugs in APIs and platform layers.</li>
       <li>Version 5.3.2 adds SCI_REPLACETARGETMINIMAL to modify text without marking unchanged start and end text in change history.</li>
       <li>Version 5.3.1 can represent invisible text with a character to simplify editing and provide summarized views.</li>
       <li>Version 5.3.0 adds change history.</li>
-      <li>Version 5.2.4 fixes failures on GTK with multi-threaded layout.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/scintilla/qt/ScintillaEdit/ScintillaEdit.pro b/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
index dd01466a38cb..f0a65941bafa 100644
--- a/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
@@ -13,7 +13,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.3.4
+VERSION = 5.3.5
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 9f9f8584773a..2b423b38aeba 100644
--- a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -268,8 +268,15 @@ void ScintillaEditBase::keyPressEvent(QKeyEvent *event)
 
 		QString text = event->text();
 		if (input && !text.isEmpty() && text[0].isPrint()) {
-			QByteArray utext = sqt->BytesForDocument(text);
-			sqt->InsertCharacter(std::string_view(utext.data(), utext.size()), CharacterSource::DirectInput);
+			const int strLen = text.length();
+			for (int i = 0; i < strLen;) {
+				const int ucWidth = text.at(i).isHighSurrogate() ? 2 : 1;
+				const QString oneCharUTF16 = text.mid(i, ucWidth);
+				const QByteArray oneChar = sqt->BytesForDocument(oneCharUTF16);
+
+				sqt->InsertCharacter(std::string_view(oneChar.data(), oneChar.length()), CharacterSource::DirectInput);
+				i += ucWidth;
+			}
 		} else {
 			event->ignore();
 		}
@@ -478,8 +485,6 @@ static std::vector<int> MapImeIndicators(QInputMethodEvent *event)
 			int indicator = IndicatorUnknown;
 			switch (charFormat.underlineStyle()) {
 				case QTextCharFormat::NoUnderline: // win32, linux
-					indicator = IndicatorTarget;
-					break;
 				case QTextCharFormat::SingleUnderline: // osx
 				case QTextCharFormat::DashUnderline: // win32, linux
 					indicator = IndicatorInput;
@@ -535,6 +540,7 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
 	}
 
 	sqt->view.imeCaretBlockOverride = false;
+	preeditPos = -1; // reset not to interrupt Qt::ImCursorRectangle.
 
 	if (!event->commitString().isEmpty()) {
 		const QString &commitStr = event->commitString();
@@ -561,6 +567,9 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
 			sqt->ClearBeforeTentativeStart();
 		sqt->pdoc->TentativeStart(); // TentativeActive() from now on.
 
+		// Fix candidate window position at the start of preeditString.
+		preeditPos = sqt->CurrentPosition();
+
 		std::vector<int> imeIndicator = MapImeIndicators(event);
 
 		for (int i = 0; i < preeditStrLen;) {
@@ -592,10 +601,14 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
 			sqt->view.imeCaretBlockOverride = true;
 		}
 
-		// Set candidate box position for Qt::ImMicroFocus.
-		preeditPos = sqt->CurrentPosition();
+		// Set Candidate window position again at imeCaret when target input.
+		const bool targetAny = std::any_of(imeIndicator.begin(), imeIndicator.end(), [](int i) noexcept {
+			return i == IndicatorTarget;
+		});
+		if (targetAny)
+			preeditPos = sqt->CurrentPosition();
+
 		sqt->EnsureCaretVisible();
-		updateMicroFocus();
 	}
 	sqt->ShowCaretAtCurrentPosition();
 }
@@ -642,7 +655,7 @@ QVariant ScintillaEditBase::inputMethodQuery(Qt::InputMethodQuery query) const
 		case Qt::ImCursorPosition:
 		{
 			const Scintilla::Position paraStart = sqt->pdoc->ParaUp(pos);
-			return QVariant(static_cast<int>(pos - paraStart));
+			return static_cast<int>(sqt->pdoc->CountUTF16(paraStart, pos));
 		}
 
 		case Qt::ImSurroundingText:
diff --git a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
index b8c41700f3b1..24c0200d5bf2 100644
--- a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.3.4
+VERSION = 5.3.5
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/scintilla/scripts/Face.py b/scintilla/scripts/Face.py
index 4ed129620e37..eaa722acf450 100644
--- a/scintilla/scripts/Face.py
+++ b/scintilla/scripts/Face.py
@@ -5,7 +5,8 @@
 # Requires Python 2.7 or later
 
 def sanitiseLine(line):
-	if line[-1:] == '\n': line = line[:-1]
+	if line[-1:] == '\n':
+		line = line[:-1]
 	if line.find("##") != -1:
 		line = line[:line.find("##")]
 	line = line.strip()
diff --git a/scintilla/scripts/FileGenerator.py b/scintilla/scripts/FileGenerator.py
index 92f4a1afb494..335c47707cb4 100644
--- a/scintilla/scripts/FileGenerator.py
+++ b/scintilla/scripts/FileGenerator.py
@@ -143,16 +143,16 @@ def UpdateLineInPlistFile(path, key, value):
     lines = []
     keyCurrent = ""
     with codecs.open(path, "rb", "utf-8") as f:
-        for l in f.readlines():
-            ls = l.strip()
+        for line in f.readlines():
+            ls = line.strip()
             if ls.startswith("<key>"):
                 keyCurrent = ls.replace("<key>", "").replace("</key>", "")
             elif ls.startswith("<string>"):
                 if keyCurrent == key:
-                    start, tag, rest = l.partition("<string>")
+                    start, tag, rest = line.partition("<string>")
                     _val, etag, end = rest.partition("</string>")
-                    l = start + tag + value + etag + end
-            lines.append(l)
+                    line = start + tag + value + etag + end
+            lines.append(line)
     contents = "".join(lines)
     UpdateFile(path, contents)
 
@@ -160,13 +160,13 @@ def UpdateLineInFile(path, linePrefix, lineReplace):
     lines = []
     updated = False
     with codecs.open(path, "r", "utf-8") as f:
-        for l in f.readlines():
-            l = l.rstrip()
-            if not updated and l.startswith(linePrefix):
+        for line in f.readlines():
+            line = line.rstrip()
+            if not updated and line.startswith(linePrefix):
                 lines.append(lineReplace)
                 updated = True
             else:
-                lines.append(l)
+                lines.append(line)
     if not updated:
         print(f"{path}:0: Can't find '{linePrefix}'")
     contents = lineEnd.join(lines) + lineEnd
@@ -176,7 +176,7 @@ def ReadFileAsList(path):
     """Read all the lnes in the file and return as a list of strings without line ends.
     """
     with codecs.open(path, "r", "utf-8") as f:
-        return [l.rstrip('\n') for l in f]
+        return [line.rstrip('\n') for line in f]
 
 def UpdateFileFromLines(path, lines, lineEndToUse):
     """Join the lines with the lineEndToUse then update file if the result is different.
@@ -194,19 +194,19 @@ def FindSectionInList(lines, markers):
     start = -1
     end = -1
     state = 0
-    for i, l in enumerate(lines):
-        if markers[0] in l:
+    for i, line in enumerate(lines):
+        if markers[0] in line:
             if markers[1]:
                 state = 1
             else:
                 start = i+1
                 state = 2
         elif state == 1:
-            if markers[1] in l:
+            if markers[1] in line:
                 start = i+1
                 state = 2
         elif state == 2:
-            if markers[2] in l:
+            if markers[2] in line:
                 end = i
                 state = 3
     # Check that section was found
diff --git a/scintilla/scripts/GenerateCaseConvert.py b/scintilla/scripts/GenerateCaseConvert.py
index 20f24ebf59f0..e44af7a0cd9c 100644
--- a/scintilla/scripts/GenerateCaseConvert.py
+++ b/scintilla/scripts/GenerateCaseConvert.py
@@ -21,11 +21,11 @@
 
 from FileGenerator import Regenerate
 
-def contiguousRanges(l, diff):
-    # l is s list of lists
+def contiguousRanges(ll, diff):
+    # ll is a list of lists
     # group into lists where first element of each element differs by diff
-    out = [[l[0]]]
-    for s in l[1:]:
+    out = [[ll[0]]]
+    for s in ll[1:]:
         if s[0] != out[-1][-1][0] + diff:
             out.append([])
         out[-1].append(s)
@@ -99,7 +99,7 @@ def distance(s):
 
     rangeCoverage = list(flatten([range(r[0], r[0]+r[2]*r[3], r[3]) for r in rangeGroups]))
 
-    nonRanges = [(l, u) for l, u, _d in symmetrics if l not in rangeCoverage]
+    nonRanges = [(x, u) for x, u, _d in symmetrics if x not in rangeCoverage]
 
     return rangeGroups, nonRanges
 
diff --git a/scintilla/scripts/HeaderCheck.py b/scintilla/scripts/HeaderCheck.py
index e24cfa1a9e8f..1fdb92ff3146 100644
--- a/scintilla/scripts/HeaderCheck.py
+++ b/scintilla/scripts/HeaderCheck.py
@@ -15,12 +15,12 @@ def HeaderFromIncludeLine(s):
     return s.strip()[1:].strip()[7:].strip()
 
 def ExtractHeaders(file):
-    with file.open(encoding="cp437") as infile:
-        return [HeaderFromIncludeLine(l) for l in infile if IsHeader(l)]
+    with file.open(encoding="iso-8859-1") as infile:
+        return [HeaderFromIncludeLine(h) for h in infile if IsHeader(h)]
 
 def ExtractWithPrefix(file, prefix):
-    with file.open(encoding="cp437") as infile:
-        return [l.strip()[len(prefix):] for l in infile if l.startswith(prefix)]
+    with file.open(encoding="iso-8859-1") as infile:
+        return [s.strip()[len(prefix):] for s in infile if s.startswith(prefix)]
 
 def ExcludeName(name, excludes):
     return any(exclude in name for exclude in excludes)
diff --git a/scintilla/scripts/LexGen.py b/scintilla/scripts/LexGen.py
index 79caa3a84cfe..baf662e761cc 100644
--- a/scintilla/scripts/LexGen.py
+++ b/scintilla/scripts/LexGen.py
@@ -34,7 +34,7 @@ def UpdateVersionNumbers(sci, root):
     UpdateLineInFile(root / "doc/ScintillaDownload.html", "       Release",
         "       Release " + sci.versionDotted)
     ReplaceREInFile(root / "doc/ScintillaDownload.html",
-        r"/www.scintilla.org/([a-zA-Z]+)\d\d\d",
+        r"/www.scintilla.org/([a-zA-Z]+)\d{3,5}",
         r"/www.scintilla.org/\g<1>" +  sci.version,
         0)
     UpdateLineInFile(root / "doc/index.html",
diff --git a/scintilla/scripts/ScintillaData.py b/scintilla/scripts/ScintillaData.py
index 8430a3321252..e82d87c220ef 100644
--- a/scintilla/scripts/ScintillaData.py
+++ b/scintilla/scripts/ScintillaData.py
@@ -25,15 +25,15 @@ def FindCredits(historyFile, removeLinks=True):
     credits = []
     stage = 0
     with historyFile.open(encoding="utf-8") as f:
-        for l in f.readlines():
-            l = l.strip()
-            if stage == 0 and l == "<table>":
+        for line in f.readlines():
+            line = line.strip()
+            if stage == 0 and line == "<table>":
                 stage = 1
-            elif stage == 1 and l == "</table>":
+            elif stage == 1 and line == "</table>":
                 stage = 2
-            if stage == 1 and l.startswith("<td>"):
-                credit = l[4:-5]
-                if removeLinks and "<a" in l:
+            if stage == 1 and line.startswith("<td>"):
+                credit = line[4:-5]
+                if removeLinks and "<a" in line:
                     title, _a, rest = credit.partition("<a href=")
                     urlplus, _bracket, end = rest.partition(">")
                     name = end.split("<")[0]
@@ -49,12 +49,12 @@ class ScintillaData:
     def __init__(self, scintillaRoot):
         # Discover version information
         self.version = (scintillaRoot / "version.txt").read_text().strip()
-        self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \
-            self.version[2]
+        self.versionDotted = self.version[0:-2] + '.' + self.version[-2] + '.' + \
+            self.version[-1]
         self.versionCommad = self.versionDotted.replace(".", ", ") + ', 0'
 
         with (scintillaRoot / "doc" / "index.html").open() as f:
-            self.dateModified = [l for l in f.readlines() if "Date.Modified" in l]\
+            self.dateModified = [d for d in f.readlines() if "Date.Modified" in d]\
                 [0].split('\"')[3]
             # 20130602
             # index.html, SciTE.html
diff --git a/scintilla/src/CallTip.cxx b/scintilla/src/CallTip.cxx
index 3dd7cdcda9a5..a05842aec9c7 100644
--- a/scintilla/src/CallTip.cxx
+++ b/scintilla/src/CallTip.cxx
@@ -108,14 +108,14 @@ void DrawArrow(Surface *surface, const PRectangle &rc, bool upArrow, ColourRGBA
 
 	constexpr XYPOSITION pixelMove = 0.0f;
 	if (upArrow) {      // Up arrow
-		Point pts[] = {
+		const Point pts[] = {
 			Point(centreX - halfWidth + pixelMove, centreY + quarterWidth + 0.5f),
 			Point(centreX + halfWidth + pixelMove, centreY + quarterWidth + 0.5f),
 			Point(centreX + pixelMove, centreY - halfWidth + quarterWidth + 0.5f),
 		};
 		surface->Polygon(pts, std::size(pts), FillStroke(colourBG));
 	} else {            // Down arrow
-		Point pts[] = {
+		const Point pts[] = {
 			Point(centreX - halfWidth + pixelMove, centreY - quarterWidth + 0.5f),
 			Point(centreX + halfWidth + pixelMove, centreY - quarterWidth + 0.5f),
 			Point(centreX + pixelMove, centreY + halfWidth - quarterWidth + 0.5f),
diff --git a/scintilla/src/CaseConvert.cxx b/scintilla/src/CaseConvert.cxx
index 19e381ba7f6b..67b6f199b876 100644
--- a/scintilla/src/CaseConvert.cxx
+++ b/scintilla/src/CaseConvert.cxx
@@ -580,7 +580,7 @@ constexpr std::string_view complexCaseConversions =
 // Maximum length of a case conversion result is 6 bytes in UTF-8
 constexpr size_t maxConversionLength = 6;
 
-class CaseConverter : public ICaseConverter {
+class CaseConverter final : public ICaseConverter {
 	struct ConversionString {
 		char conversion[maxConversionLength+1]{};
 	};
@@ -605,7 +605,6 @@ class CaseConverter : public ICaseConverter {
 			return character < other.character;
 		}
 	};
-	CaseConversion conversion;
 	typedef std::vector<CharacterConversion> CharacterToConversion;
 	CharacterToConversion characterToConversion;
 	// The parallel arrays
@@ -613,14 +612,7 @@ class CaseConverter : public ICaseConverter {
 	std::vector<ConversionString> conversions;
 
 public:
-	explicit CaseConverter(CaseConversion conversion_) : conversion(conversion_) {
-	};
-	// Deleted so CaseConverter objects can not be copied.
-	CaseConverter(const CaseConverter &) = delete;
-	CaseConverter(CaseConverter &&) = delete;
-	CaseConverter &operator=(const CaseConverter &) = delete;
-	CaseConverter &operator=(CaseConverter &&) = delete;
-	virtual ~CaseConverter() noexcept = default;
+	CaseConverter() noexcept = default;
 	bool Initialised() const noexcept {
 		return !characters.empty();
 	}
@@ -690,15 +682,13 @@ class CaseConverter : public ICaseConverter {
 		// Empty the original calculated data completely
 		CharacterToConversion().swap(characterToConversion);
 	}
-	void AddSymmetric(int lower, int upper);
-	void SetupConversions();
+	void AddSymmetric(CaseConversion conversion, int lower, int upper);
+	void SetupConversions(CaseConversion conversion);
 };
 
-CaseConverter caseConvFold(CaseConversion::fold);
-CaseConverter caseConvUp(CaseConversion::upper);
-CaseConverter caseConvLow(CaseConversion::lower);
+CaseConverter caseConvList[3];
 
-void CaseConverter::AddSymmetric(int lower, int upper) {
+void CaseConverter::AddSymmetric(CaseConversion conversion, int lower, int upper) {
 	const int character = (conversion == CaseConversion::upper) ? lower : upper;
 	const int source = (conversion == CaseConversion::upper) ? upper : lower;
 	char converted[maxConversionLength+1]{};
@@ -720,7 +710,7 @@ std::string_view NextField(std::string_view &view) {
 	return field;
 }
 
-void CaseConverter::SetupConversions() {
+void CaseConverter::SetupConversions(CaseConversion conversion) {
 	// First initialize for the symmetric ranges
 	for (size_t i=0; i<std::size(symmetricCaseConversionRanges);) {
 		const int lower = symmetricCaseConversionRanges[i++];
@@ -728,14 +718,14 @@ void CaseConverter::SetupConversions() {
 		const int length = symmetricCaseConversionRanges[i++];
 		const int pitch = symmetricCaseConversionRanges[i++];
 		for (int j=0; j<length*pitch; j+=pitch) {
-			AddSymmetric(lower+j, upper+j);
+			AddSymmetric(conversion, lower+j, upper+j);
 		}
 	}
 	// Add the symmetric singletons
 	for (size_t i=0; i<std::size(symmetricCaseConversions);) {
 		const int lower = symmetricCaseConversions[i++];
 		const int upper = symmetricCaseConversions[i++];
-		AddSymmetric(lower, upper);
+		AddSymmetric(conversion, lower, upper);
 	}
 	// Add the complex cases
 	std::string_view sComplex = complexCaseConversions;
@@ -768,21 +758,11 @@ void CaseConverter::SetupConversions() {
 }
 
 CaseConverter *ConverterForConversion(CaseConversion conversion) {
-	CaseConverter *pCaseConv = &caseConvFold;
-	switch (conversion) {
-	case CaseConversion::fold:
-		pCaseConv = &caseConvFold;
-		break;
-	case CaseConversion::upper:
-		pCaseConv = &caseConvUp;
-		break;
-	case CaseConversion::lower:
-	default:
-		pCaseConv = &caseConvLow;
-		break;
-	}
+	const unsigned index = static_cast<unsigned>(conversion);
+	assert(index < std::size(caseConvList));
+	CaseConverter *pCaseConv = &caseConvList[index];
 	if (!pCaseConv->Initialised()) {
-		pCaseConv->SetupConversions();
+		pCaseConv->SetupConversions(conversion);
 	}
 	return pCaseConv;
 }
diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx
index f0ce19a8413f..70181d989e33 100644
--- a/scintilla/src/Document.cxx
+++ b/scintilla/src/Document.cxx
@@ -2880,7 +2880,7 @@ class RESearchRange {
 };
 
 // Define a way for the Regular Expression code to access the document
-class DocumentIndexer : public CharacterIndexer {
+class DocumentIndexer final : public CharacterIndexer {
 	Document *pdoc;
 	Sci::Position end;
 public:
@@ -2888,13 +2888,6 @@ class DocumentIndexer : public CharacterIndexer {
 		pdoc(pdoc_), end(end_) {
 	}
 
-	DocumentIndexer(const DocumentIndexer &) = delete;
-	DocumentIndexer(DocumentIndexer &&) = delete;
-	DocumentIndexer &operator=(const DocumentIndexer &) = delete;
-	DocumentIndexer &operator=(DocumentIndexer &&) = delete;
-
-	~DocumentIndexer() override = default;
-
 	char CharAt(Sci::Position index) const noexcept override {
 		if (index < 0 || index >= end)
 			return 0;
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index 463b14815320..79d98ec851f8 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -26,6 +26,7 @@
 #include <memory>
 #include <chrono>
 #include <atomic>
+#include <mutex>
 #include <thread>
 #include <future>
 
@@ -1510,7 +1511,7 @@ bool Editor::WrapBlock(Surface *surface, Sci::Line lineToWrap, Sci::Line lineToW
 	// Lines that are less likely to be re-examined should not be read from or written to the cache.
 	const SignificantLines significantLines {
 		pdoc->SciLineFromPosition(sel.MainCaret()),
-		topLine,
+		pcs->DocFromDisplay(topLine),
 		LinesOnScreen() + 1,
 		view.llc.GetLevel(),
 	};
@@ -1914,7 +1915,7 @@ Sci::Position Editor::FormatRange(Scintilla::Message iMessage, Scintilla::uptr_t
 	void *ptr = PtrFromSPtr(lParam);
 	if (iMessage == Message::FormatRange) {
 		RangeToFormat *pfr = static_cast<RangeToFormat *>(ptr);
-		CharacterRangeFull chrg{ pfr->chrg.cpMin,pfr->chrg.cpMax };
+		const CharacterRangeFull chrg{ pfr->chrg.cpMin,pfr->chrg.cpMax };
 		AutoSurface surface(pfr->hdc, this, Technology::Default);
 		AutoSurface surfaceMeasure(pfr->hdcTarget, this, Technology::Default);
 		if (!surface || !surfaceMeasure) {
diff --git a/scintilla/src/Geometry.h b/scintilla/src/Geometry.h
index 4e4fe95d905d..f417caae0a9e 100644
--- a/scintilla/src/Geometry.h
+++ b/scintilla/src/Geometry.h
@@ -172,6 +172,7 @@ PRectangle PixelAlignOutside(const PRectangle &rc, int pixelDivisions) noexcept;
 */
 constexpr const float componentMaximum = 255.0f;
 class ColourRGBA {
+	static constexpr int rgbMask = 0xffffff;
 	int co;
 public:
 	constexpr explicit ColourRGBA(int co_ = 0) noexcept : co(co_) {
@@ -190,11 +191,11 @@ class ColourRGBA {
 	}
 
 	static constexpr ColourRGBA FromIpRGB(intptr_t co_) noexcept {
-		return ColourRGBA(static_cast<int>(co_) | (0xffu << 24));
+		return ColourRGBA((co_ & rgbMask) | (0xffu << 24));
 	}
 
 	constexpr ColourRGBA WithoutAlpha() const noexcept {
-		return ColourRGBA(co & 0xffffff);
+		return ColourRGBA(co & rgbMask);
 	}
 
 	constexpr ColourRGBA Opaque() const noexcept {
@@ -206,7 +207,7 @@ class ColourRGBA {
 	}
 
 	constexpr int OpaqueRGB() const noexcept {
-		return co & 0xffffff;
+		return co & rgbMask;
 	}
 
 	// Red, green and blue values as bytes 0..255
diff --git a/scintilla/src/LineMarker.cxx b/scintilla/src/LineMarker.cxx
index 5bf4d07c49fb..e19df31ec053 100644
--- a/scintilla/src/LineMarker.cxx
+++ b/scintilla/src/LineMarker.cxx
@@ -144,7 +144,7 @@ void DrawTail(Surface *surface, XYPOSITION leftLine, XYPOSITION rightTail, XYPOS
 	const XYPOSITION strokeTop = centreY + slopeLength;
 	const XYPOSITION halfWidth = widthSymbolStroke / 2.0f;
 	const XYPOSITION strokeMiddle = strokeTop + halfWidth;
-	Point lines[] = {
+	const Point lines[] = {
 		// Stick
 		Point(rightTail, strokeMiddle),
 		Point(leftLine + halfWidth + slopeLength, strokeMiddle),
@@ -396,7 +396,7 @@ void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *f
 		break;
 
 	case MarkerSymbol::Arrow: {
-			Point pts[] = {
+			const Point pts[] = {
 				Point(centreX - dimOn4, centreY - dimOn2),
 				Point(centreX - dimOn4, centreY + dimOn2),
 				Point(centreX + dimOn2 - dimOn4, centreY),
@@ -406,7 +406,7 @@ void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *f
 		break;
 
 	case MarkerSymbol::ArrowDown: {
-			Point pts[] = {
+			const Point pts[] = {
 				Point(centreX - dimOn2, centreY - dimOn4),
 				Point(centreX + dimOn2, centreY - dimOn4),
 				Point(centreX, centreY + dimOn2 - dimOn4),
@@ -416,7 +416,7 @@ void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *f
 		break;
 
 	case MarkerSymbol::Plus: {
-			Point pts[] = {
+			const Point pts[] = {
 				Point(centreX - armSize, centreY - 1),
 				Point(centreX - 1, centreY - 1),
 				Point(centreX - 1, centreY - armSize),
@@ -435,7 +435,7 @@ void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *f
 		break;
 
 	case MarkerSymbol::Minus: {
-			Point pts[] = {
+			const Point pts[] = {
 				Point(centreX - armSize, centreY - 1),
 				Point(centreX + armSize, centreY - 1),
 				Point(centreX + armSize, centreY + 1),
@@ -489,7 +489,7 @@ void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *f
 		break;
 
 	case MarkerSymbol::ShortArrow: {
-			Point pts[] = {
+			const Point pts[] = {
 				Point(centreX, centreY + dimOn2),
 				Point(centreX + dimOn2, centreY),
 				Point(centreX, centreY - dimOn2),
@@ -547,7 +547,7 @@ void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *f
 
 	case MarkerSymbol::Bookmark: {
 			const XYPOSITION halfHeight = std::floor(minDim / 3);
-			Point pts[] = {
+			const Point pts[] = {
 				Point(rcWhole.left, centreY - halfHeight),
 				Point(rcWhole.right - strokeWidth - 2, centreY - halfHeight),
 				Point(rcWhole.right - strokeWidth - 2 - halfHeight, centreY),
@@ -560,7 +560,7 @@ void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *f
 
 	case MarkerSymbol::VerticalBookmark: {
 			const XYPOSITION halfWidth = std::floor(minDim / 3);
-			Point pts[] = {
+			const Point pts[] = {
 				Point(centreX - halfWidth, centreY - dimOn2),
 				Point(centreX + halfWidth, centreY - dimOn2),
 				Point(centreX + halfWidth, centreY + dimOn2),
diff --git a/scintilla/src/MarginView.cxx b/scintilla/src/MarginView.cxx
index 7f63f30475bb..6cc961db2b3e 100644
--- a/scintilla/src/MarginView.cxx
+++ b/scintilla/src/MarginView.cxx
@@ -92,7 +92,7 @@ void DrawWrapMarker(Surface *surface, PRectangle rcPlace,
 		}
 	};
 
-	Relative rel = { x0, isEndMarker ? 1 : -1, y0, 1, widthStroke / 2.0f };
+	const Relative rel = { x0, isEndMarker ? 1 : -1, y0, 1, widthStroke / 2.0f };
 
 	// arrow head
 	const Point head[] = {
diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx
index da2267afe9ce..d73108c33908 100644
--- a/scintilla/src/PositionCache.cxx
+++ b/scintilla/src/PositionCache.cxx
@@ -461,7 +461,7 @@ bool SignificantLines::LineMayCache(Sci::Line line) const noexcept {
 	case LineCache::Caret:
 		return line == lineCaret;
 	case LineCache::Page:
-		return (abs(line - lineCaret) < linesOnScreen) ||
+		return (std::abs(line - lineCaret) < linesOnScreen) ||
 			((line >= lineTop) && (line <= (lineTop + linesOnScreen)));
 	case LineCache::Document:
 	default:
diff --git a/scintilla/src/RESearch.h b/scintilla/src/RESearch.h
index a9ea8054ee31..81fc67d029ca 100644
--- a/scintilla/src/RESearch.h
+++ b/scintilla/src/RESearch.h
@@ -14,8 +14,6 @@ namespace Scintilla::Internal {
 class CharacterIndexer {
 public:
 	virtual char CharAt(Sci::Position index) const=0;
-	virtual ~CharacterIndexer() {
-	}
 };
 
 class RESearch {
diff --git a/scintilla/src/ScintillaBase.cxx b/scintilla/src/ScintillaBase.cxx
index 0fda40245805..08e827629877 100644
--- a/scintilla/src/ScintillaBase.cxx
+++ b/scintilla/src/ScintillaBase.cxx
@@ -265,7 +265,7 @@ void ScintillaBase::AutoCompleteStart(Sci::Position lenEntered, const char *list
 		}
 	}
 
-	ListOptions options{
+	const ListOptions options{
 		vs.ElementColour(Element::List),
 		vs.ElementColour(Element::ListBack),
 		vs.ElementColour(Element::ListSelected),
diff --git a/scintilla/src/XPM.cxx b/scintilla/src/XPM.cxx
index 1748d663c2b1..a26b793b55c5 100644
--- a/scintilla/src/XPM.cxx
+++ b/scintilla/src/XPM.cxx
@@ -266,7 +266,7 @@ void RGBAImage::SetPixel(int x, int y, ColourRGBA colour) noexcept {
 
 namespace {
 
-unsigned char AlphaMultiplied(unsigned char value, unsigned char alpha) {
+constexpr unsigned char AlphaMultiplied(unsigned char value, unsigned char alpha) noexcept {
 	return (value * alpha / UCHAR_MAX) & 0xffU;
 }
 
diff --git a/scintilla/test/ScintillaCallable.py b/scintilla/test/ScintillaCallable.py
index 065f4166cc61..a86fb3b94437 100644
--- a/scintilla/test/ScintillaCallable.py
+++ b/scintilla/test/ScintillaCallable.py
@@ -2,9 +2,9 @@
 
 from __future__ import unicode_literals
 
-import ctypes, os, sys
+import ctypes
 
-from ctypes import c_int, c_ulong, c_char_p, c_wchar_p, c_ushort, c_uint, c_long, c_ssize_t
+from ctypes import c_int, c_char_p, c_long, c_ssize_t
 
 def IsEnumeration(t):
 	return t[:1].isupper()
@@ -52,7 +52,7 @@ def __init__(self, fn, ptr, msg, stringResult=False):
 		self._ptr = ptr
 		self._msg = msg
 		self._stringResult = stringResult
-	def __call__(self, w=0, l=0):
+	def __call__(self, w=0, lp=0):
 		ww = ctypes.cast(w, c_char_p)
 		if self._stringResult:
 			lengthBytes = self._fn(self._ptr, self._msg, ww, None)
@@ -63,7 +63,7 @@ def __call__(self, w=0, l=0):
 			assert lengthBytes == lengthBytes2
 			return bytearray(result)[:lengthBytes]
 		else:
-			ll = ctypes.cast(l, c_char_p)
+			ll = ctypes.cast(lp, c_char_p)
 			return self._fn(self._ptr, self._msg, ww, ll)
 
 sciFX = ctypes.CFUNCTYPE(c_ssize_t, c_char_p, c_int, c_char_p, c_char_p)
diff --git a/scintilla/test/XiteWin.py b/scintilla/test/XiteWin.py
index c9b0bce043a5..014aa1770792 100644
--- a/scintilla/test/XiteWin.py
+++ b/scintilla/test/XiteWin.py
@@ -8,8 +8,7 @@
 import os, platform, sys, unittest
 
 import ctypes
-from ctypes import wintypes
-from ctypes import c_int, c_ulong, c_char_p, c_wchar_p, c_ushort, c_uint, c_long
+from ctypes import c_int, c_char_p, c_wchar_p, c_ushort, c_uint
 from ctypes.wintypes import HWND, WPARAM, LPARAM, HANDLE, HBRUSH, LPCWSTR
 user32=ctypes.windll.user32
 gdi32=ctypes.windll.gdi32
@@ -248,11 +247,11 @@ def ChooseLexer(self, lexer):
 	def Invalidate(self):
 		user32.InvalidateRect(self.win, 0, 0)
 
-	def WndProc(self, h, m, w, l):
+	def WndProc(self, h, m, wp, lp):
 		user32.DefWindowProcW.argtypes = [HWND, c_uint, WPARAM, LPARAM]
 		ms = sgsm.get(m, "XXX")
 		if trace:
-			print("%s %s %s %s" % (hex(h)[2:],ms,w,l))
+			print("%s %s %s %s" % (hex(h)[2:],ms,wp,lp))
 		if ms == "WM_CLOSE":
 			user32.PostQuitMessage(0)
 		elif ms == "WM_CREATE":
@@ -260,20 +259,20 @@ def WndProc(self, h, m, w, l):
 			return 0
 		elif ms == "WM_SIZE":
 			# Work out size
-			if w != 1:
+			if wp != 1:
 				self.OnSize()
 			return 0
 		elif ms == "WM_COMMAND":
-			cmdCode = w & 0xffff
+			cmdCode = wp & 0xffff
 			if cmdCode in self.cmds:
 				self.Command(self.cmds[cmdCode])
 			return 0
 		elif ms == "WM_ACTIVATE":
-			if w != WA_INACTIVE:
+			if wp != WA_INACTIVE:
 				self.FocusOnEditor()
 			return 0
 		else:
-			return user32.DefWindowProcW(h, m, w, l)
+			return user32.DefWindowProcW(h, m, wp, lp)
 		return 0
 
 	def Command(self, name):
@@ -506,7 +505,7 @@ def CmdOpen(self):
 		self.Open()
 
 	def CmdSave(self):
-		if (self.fullPath == None) or (len(self.fullPath) == 0):
+		if (self.fullPath is None) or (len(self.fullPath) == 0):
 			self.SaveAs()
 		else:
 			self.Save()
diff --git a/scintilla/test/performanceTests.py b/scintilla/test/performanceTests.py
index 840412ca3b70..3ab0f725b29c 100644
--- a/scintilla/test/performanceTests.py
+++ b/scintilla/test/performanceTests.py
@@ -5,7 +5,7 @@
 from __future__ import with_statement
 from __future__ import unicode_literals
 
-import os, string, sys, time, unittest
+import string, time, unittest
 
 try:
 	start = time.perf_counter()
diff --git a/scintilla/test/simpleTests.py b/scintilla/test/simpleTests.py
index 38814bf8e8cf..865b6877b2ea 100644
--- a/scintilla/test/simpleTests.py
+++ b/scintilla/test/simpleTests.py
@@ -414,7 +414,7 @@ def testUBreakApartEOL(self):
 		self.xite.ChooseLexer(b"cpp")
 		self.ed.SetCodePage(65001)
 		self.ed.SetLineEndTypesAllowed(1)
-		text = b"x\xe2\x80\xa9y";
+		text = b"x\xe2\x80\xa9y"
 		self.ed.AddText(5, text)
 		self.assertEquals(self.ed.LineCount, 2)
 
@@ -501,7 +501,7 @@ def testNELBreakApartEOL(self):
 		self.xite.ChooseLexer(b"cpp")
 		self.ed.SetCodePage(65001)
 		self.ed.SetLineEndTypesAllowed(1)
-		text = b"x\xc2\x85y";
+		text = b"x\xc2\x85y"
 		self.ed.AddText(4, text)
 		self.assertEquals(self.ed.LineCount, 2)
 
@@ -1165,8 +1165,10 @@ def testMarker(self):
 
 	def testTwiceAddedDelete(self):
 		handle = self.ed.MarkerAdd(1,1)
+		self.assertNotEqual(handle, -1)
 		self.assertEquals(self.ed.MarkerGet(1), 2)
 		handle2 = self.ed.MarkerAdd(1,1)
+		self.assertNotEqual(handle2, -1)
 		self.assertEquals(self.ed.MarkerGet(1), 2)
 		self.ed.MarkerDelete(1,1)
 		self.assertEquals(self.ed.MarkerGet(1), 2)
@@ -1207,7 +1209,9 @@ def testMarkerAddSet(self):
 	def testMarkerNext(self):
 		self.assertEquals(self.ed.MarkerNext(0, 2), -1)
 		h1 = self.ed.MarkerAdd(0,1)
+		self.assertNotEqual(h1, -1)
 		h2 = self.ed.MarkerAdd(2,1)
+		self.assertNotEqual(h2, -1)
 		self.assertEquals(self.ed.MarkerNext(0, 2), 0)
 		self.assertEquals(self.ed.MarkerNext(1, 2), 2)
 		self.assertEquals(self.ed.MarkerNext(2, 2), 2)
@@ -2448,8 +2452,6 @@ def testUTF32(self):
 
 	def testUTF16(self):
 		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
-		t = "aå\U00010348flﬔ-"
-		tv = t.encode("UTF-8")
 		self.ed.SetContents(self.tv)
 		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF16)
 		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
@@ -2821,7 +2823,8 @@ def testInactive(self):
 
 	def testSecondary(self):
 		inactiveDistance = self.ed.DistanceToSecondaryStyles()
-		self.assertEquals(self.ed.GetPrimaryStyleFromStyle(self.ed.SCE_C_IDENTIFIER+inactiveDistance), self.ed.SCE_C_IDENTIFIER)
+		inactiveIdentifier = self.ed.SCE_C_IDENTIFIER+inactiveDistance
+		self.assertEquals(self.ed.GetPrimaryStyleFromStyle(inactiveIdentifier), self.ed.SCE_C_IDENTIFIER)
 
 class TestCallTip(unittest.TestCase):
 
diff --git a/scintilla/test/win32Tests.py b/scintilla/test/win32Tests.py
index 974f6ceae378..d1fc3652f05c 100644
--- a/scintilla/test/win32Tests.py
+++ b/scintilla/test/win32Tests.py
@@ -10,11 +10,10 @@
 from __future__ import with_statement
 from __future__ import unicode_literals
 
-import codecs, ctypes, os, sys, unittest
+import ctypes, unittest
 
-from MessageNumbers import msgs, sgsm
+from MessageNumbers import msgs
 
-import ctypes
 user32 = ctypes.windll.user32
 
 import XiteWin as Xite
@@ -32,8 +31,8 @@ def setUp(self):
 
 	# Helper methods
 
-	def Send(self, msg, w, l):
-		return user32.SendMessageW(self.sciHwnd, msgs[msg], w, l)
+	def Send(self, msg, wp, lp):
+		return user32.SendMessageW(self.sciHwnd, msgs[msg], wp, lp)
 
 	def GetTextLength(self):
 		return self.Send("WM_GETTEXTLENGTH", 0, 0)
diff --git a/scintilla/version.txt b/scintilla/version.txt
index 54ba45626bfa..b3ccc5cdb98d 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-534
+535
diff --git a/scintilla/win32/PlatWin.cxx b/scintilla/win32/PlatWin.cxx
index 7a9f41ae4771..d1cbe88e7f9c 100644
--- a/scintilla/win32/PlatWin.cxx
+++ b/scintilla/win32/PlatWin.cxx
@@ -963,7 +963,7 @@ void SurfaceGDI::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke
 				section.SetSymmetric(x, corner - x, valOutline);
 			}
 
-			AlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
+			GdiAlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
 		}
 	} else {
 		BrushColour(fillStroke.stroke.colour);
@@ -1002,7 +1002,7 @@ void SurfaceGDI::GradientRectangle(PRectangle rc, const std::vector<ColourStop>
 			}
 		}
 
-		AlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
+		GdiAlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
 	}
 }
 
@@ -1019,7 +1019,7 @@ void SurfaceGDI::DrawRGBAImage(PRectangle rc, int width, int height, const unsig
 		DIBSection section(hdc, size);
 		if (section) {
 			RGBAImage::BGRAFromRGBA(section.Bytes(), pixelsImage, static_cast<size_t>(width) * height);
-			AlphaBlend(hdc, static_cast<int>(rc.left), static_cast<int>(rc.top),
+			GdiAlphaBlend(hdc, static_cast<int>(rc.left), static_cast<int>(rc.top),
 				static_cast<int>(rc.Width()), static_cast<int>(rc.Height()), section.DC(),
 				0, 0, width, height, mergeAlpha);
 		}
@@ -1713,19 +1713,19 @@ void SurfaceD2D::RoundedRectangle(PRectangle rc, FillStroke fillStroke) {
 		const FLOAT minDimension = static_cast<FLOAT>(std::min(rc.Width(), rc.Height())) / 2.0f;
 		const FLOAT radius = std::min(4.0f, minDimension);
 		if (fillStroke.fill.colour == fillStroke.stroke.colour) {
-			D2D1_ROUNDED_RECT roundedRectFill = {
+			const D2D1_ROUNDED_RECT roundedRectFill = {
 				RectangleFromPRectangle(rc),
 				radius, radius };
 			D2DPenColourAlpha(fillStroke.fill.colour);
 			pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
 		} else {
-			D2D1_ROUNDED_RECT roundedRectFill = {
+			const D2D1_ROUNDED_RECT roundedRectFill = {
 				RectangleFromPRectangle(rc.Inset(1.0)),
 				radius-1, radius-1 };
 			D2DPenColourAlpha(fillStroke.fill.colour);
 			pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
 
-			D2D1_ROUNDED_RECT roundedRect = {
+			const D2D1_ROUNDED_RECT roundedRect = {
 				RectangleFromPRectangle(rc.Inset(0.5)),
 				radius, radius };
 			D2DPenColourAlpha(fillStroke.stroke.colour);
@@ -1749,12 +1749,12 @@ void SurfaceD2D::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke
 			pRenderTarget->DrawRectangle(rectOutline, pBrush, fillStroke.stroke.WidthF());
 		} else {
 			const float cornerSizeF = static_cast<float>(cornerSize);
-			D2D1_ROUNDED_RECT roundedRectFill = {
+			const D2D1_ROUNDED_RECT roundedRectFill = {
 				rectFill, cornerSizeF - 1.0f, cornerSizeF - 1.0f };
 			D2DPenColourAlpha(fillStroke.fill.colour);
 			pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
 
-			D2D1_ROUNDED_RECT roundedRect = {
+			const D2D1_ROUNDED_RECT roundedRect = {
 				rectOutline, cornerSizeF, cornerSizeF};
 			D2DPenColourAlpha(fillStroke.stroke.colour);
 			pRenderTarget->DrawRoundedRectangle(roundedRect, pBrush, fillStroke.stroke.WidthF());
@@ -1814,7 +1814,7 @@ void SurfaceD2D::DrawRGBAImage(PRectangle rc, int width, int height, const unsig
 
 		ID2D1Bitmap *bitmap = nullptr;
 		const D2D1_SIZE_U size = D2D1::SizeU(width, height);
-		D2D1_BITMAP_PROPERTIES props = {{DXGI_FORMAT_B8G8R8A8_UNORM,
+		const D2D1_BITMAP_PROPERTIES props = {{DXGI_FORMAT_B8G8R8A8_UNORM,
 		    D2D1_ALPHA_MODE_PREMULTIPLIED}, 72.0, 72.0};
 		const HRESULT hr = pRenderTarget->CreateBitmap(size, image.data(),
                   width * 4, &props, &bitmap);
@@ -1857,12 +1857,12 @@ void SurfaceD2D::Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) {
 	const FLOAT halfStroke = fillStroke.stroke.WidthF() / 2.0f;
 	if (ends == Surface::Ends::semiCircles) {
 		const D2D1_RECT_F rect = RectangleFromPRectangle(rc);
-		D2D1_ROUNDED_RECT roundedRectFill = { RectangleInset(rect, fillStroke.stroke.WidthF()),
+		const D2D1_ROUNDED_RECT roundedRectFill = { RectangleInset(rect, fillStroke.stroke.WidthF()),
 			radiusFill, radiusFill };
 		D2DPenColourAlpha(fillStroke.fill.colour);
 		pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
 
-		D2D1_ROUNDED_RECT roundedRect = { RectangleInset(rect, halfStroke),
+		const D2D1_ROUNDED_RECT roundedRect = { RectangleInset(rect, halfStroke),
 			radius, radius };
 		D2DPenColourAlpha(fillStroke.stroke.colour);
 		pRenderTarget->DrawRoundedRectangle(roundedRect, pBrush, fillStroke.stroke.WidthF());
@@ -1954,7 +1954,7 @@ void SurfaceD2D::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
 	}
 }
 
-class BlobInline : public IDWriteInlineObject {
+class BlobInline final : public IDWriteInlineObject {
 	XYPOSITION width;
 
 	// IUnknown
@@ -1980,12 +1980,6 @@ class BlobInline : public IDWriteInlineObject {
 public:
 	BlobInline(XYPOSITION width_=0.0f) noexcept : width(width_) {
 	}
-	// Defaulted so BlobInline objects can be copied.
-	BlobInline(const BlobInline &) = default;
-	BlobInline(BlobInline &&) = default;
-	BlobInline &operator=(const BlobInline &) = default;
-	BlobInline &operator=(BlobInline &&) = default;
-	virtual ~BlobInline() noexcept = default;
 };
 
 /// Implement IUnknown
@@ -1995,9 +1989,9 @@ STDMETHODIMP BlobInline::QueryInterface(REFIID riid, PVOID *ppv) {
 	// Never called so not checked.
 	*ppv = nullptr;
 	if (riid == IID_IUnknown)
-		*ppv = static_cast<IUnknown *>(this);
+		*ppv = this;
 	if (riid == __uuidof(IDWriteInlineObject))
-		*ppv = static_cast<IDWriteInlineObject *>(this);
+		*ppv = this;
 	if (!*ppv)
 		return E_NOINTERFACE;
 	return S_OK;
@@ -2869,7 +2863,7 @@ void Window::SetCursor(Cursor curs) {
    coordinates */
 PRectangle Window::GetMonitorRect(Point pt) {
 	const PRectangle rcPosition = GetPosition();
-	POINT ptDesktop = {static_cast<LONG>(pt.x + rcPosition.left),
+	const POINT ptDesktop = {static_cast<LONG>(pt.x + rcPosition.left),
 		static_cast<LONG>(pt.y + rcPosition.top)};
 	HMONITOR hMonitor = MonitorFromPoint(ptDesktop, MONITOR_DEFAULTTONEAREST);
 
@@ -2915,7 +2909,7 @@ class LineToItem {
 	}
 
 	void AllocItem(const char *text, int pixId) {
-		ListItemData lid = { text, pixId };
+		const ListItemData lid = { text, pixId };
 		data.push_back(lid);
 	}
 
diff --git a/scintilla/win32/PlatWin.h b/scintilla/win32/PlatWin.h
index 54cd687e9e09..115ac0ccd3b0 100644
--- a/scintilla/win32/PlatWin.h
+++ b/scintilla/win32/PlatWin.h
@@ -19,7 +19,7 @@ extern void Platform_Initialise(void *hInstance) noexcept;
 extern void Platform_Finalise(bool fromDllMain) noexcept;
 
 constexpr RECT RectFromPRectangle(PRectangle prc) noexcept {
-	RECT rc = { static_cast<LONG>(prc.left), static_cast<LONG>(prc.top),
+	const RECT rc = { static_cast<LONG>(prc.left), static_cast<LONG>(prc.top),
 		static_cast<LONG>(prc.right), static_cast<LONG>(prc.bottom) };
 	return rc;
 }
diff --git a/scintilla/win32/ScintRes.rc b/scintilla/win32/ScintRes.rc
index 58feaaa83d64..0a167c01ebb4 100644
--- a/scintilla/win32/ScintRes.rc
+++ b/scintilla/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "5.3.4"
-#define VERSION_WORDS 5, 3, 4, 0
+#define VERSION_SCINTILLA "5.3.5"
+#define VERSION_WORDS 5, 3, 5, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/scintilla/win32/Scintilla.vcxproj b/scintilla/win32/Scintilla.vcxproj
index 9ab20e4533cc..2911afdddec2 100644
--- a/scintilla/win32/Scintilla.vcxproj
+++ b/scintilla/win32/Scintilla.vcxproj
@@ -101,7 +101,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx
index 335ca9be7383..4da62a32dc90 100644
--- a/scintilla/win32/ScintillaWin.cxx
+++ b/scintilla/win32/ScintillaWin.cxx
@@ -200,44 +200,82 @@ constexpr bool KeyboardIsNumericKeypadFunction(uptr_t wParam, sptr_t lParam) {
 	}
 }
 
-typedef void VFunction(void);
-
 /**
  */
-class FormatEnumerator {
+class FormatEnumerator final : public IEnumFORMATETC {
 public:
-	VFunction **vtbl;
 	ULONG ref;
 	ULONG pos;
 	std::vector<CLIPFORMAT> formats;
 	FormatEnumerator(ULONG pos_, const CLIPFORMAT formats_[], size_t formatsLen_);
+
+	// IUnknown
+	STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv) override;
+	STDMETHODIMP_(ULONG)AddRef() override;
+	STDMETHODIMP_(ULONG)Release() override;
+
+	// IEnumFORMATETC
+	STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) override;
+	STDMETHODIMP Skip(ULONG celt) override;
+	STDMETHODIMP Reset() override;
+	STDMETHODIMP Clone(IEnumFORMATETC **ppenum) override;
 };
 
 /**
  */
-class DropSource {
+class DropSource final : public IDropSource {
 public:
-	VFunction **vtbl;
-	ScintillaWin *sci;
-	DropSource() noexcept;
+	ScintillaWin *sci = nullptr;
+
+	// IUnknown
+	STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv) override;
+	STDMETHODIMP_(ULONG)AddRef() override;
+	STDMETHODIMP_(ULONG)Release() override;
+
+	// IDropSource
+	STDMETHODIMP QueryContinueDrag(BOOL fEsc, DWORD grfKeyState) override;
+	STDMETHODIMP GiveFeedback(DWORD) override;
 };
 
 /**
  */
-class DataObject {
+class DataObject final : public IDataObject {
 public:
-	VFunction **vtbl;
-	ScintillaWin *sci;
-	DataObject() noexcept;
+	ScintillaWin *sci = nullptr;
+
+	// IUnknown
+	STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv) override;
+	STDMETHODIMP_(ULONG)AddRef() override;
+	STDMETHODIMP_(ULONG)Release() override;
+
+	// IDataObject
+	STDMETHODIMP GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) override;
+	STDMETHODIMP GetDataHere(FORMATETC *, STGMEDIUM *) override;
+	STDMETHODIMP QueryGetData(FORMATETC *pFE) override;
+	STDMETHODIMP GetCanonicalFormatEtc(FORMATETC *, FORMATETC *pFEOut)  override;
+	STDMETHODIMP SetData(FORMATETC *, STGMEDIUM *, BOOL) override;
+	STDMETHODIMP EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnum) override;
+	STDMETHODIMP DAdvise(FORMATETC *, DWORD, IAdviseSink *, PDWORD) override;
+	STDMETHODIMP DUnadvise(DWORD) override;
+	STDMETHODIMP EnumDAdvise(IEnumSTATDATA **) override;
 };
 
 /**
  */
-class DropTarget {
+class DropTarget final : public IDropTarget {
 public:
-	VFunction **vtbl;
-	ScintillaWin *sci;
-	DropTarget() noexcept;
+	ScintillaWin *sci = nullptr;
+
+	// IUnknown
+	STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv) override;
+	STDMETHODIMP_(ULONG)AddRef() override;
+	STDMETHODIMP_(ULONG)Release() override;
+
+	// IDropTarget
+	STDMETHODIMP DragEnter(LPDATAOBJECT pIDataSource, DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) override;
+	STDMETHODIMP DragOver(DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) override;
+	STDMETHODIMP DragLeave() override;
+	STDMETHODIMP Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) override;
 };
 
 class IMContext {
@@ -411,6 +449,7 @@ class ScintillaWin :
 	void ImeStartComposition();
 	void ImeEndComposition();
 	LRESULT ImeOnReconvert(LPARAM lParam);
+	LRESULT ImeOnDocumentFeed(LPARAM lParam) const;
 	sptr_t HandleCompositionWindowed(uptr_t wParam, sptr_t lParam);
 	sptr_t HandleCompositionInline(uptr_t wParam, sptr_t lParam);
 	static bool KoreanIME() noexcept;
@@ -782,8 +821,8 @@ void ScintillaWin::StartDrag() {
 	inDragDrop = DragDrop::dragging;
 	DWORD dwEffect = 0;
 	dropWentOutside = true;
-	IDataObject *pDataObject = reinterpret_cast<IDataObject *>(&dob);
-	IDropSource *pDropSource = reinterpret_cast<IDropSource *>(&ds);
+	IDataObject *pDataObject = &dob;
+	IDropSource *pDropSource = &ds;
 	//Platform::DebugPrintf("About to DoDragDrop %x %x\n", pDataObject, pDropSource);
 	const HRESULT hr = ::DoDragDrop(
 	                 pDataObject,
@@ -1777,6 +1816,9 @@ sptr_t ScintillaWin::IMEMessage(unsigned int iMessage, uptr_t wParam, sptr_t lPa
 			if (wParam == IMR_RECONVERTSTRING) {
 				return ImeOnReconvert(lParam);
 			}
+			if (wParam == IMR_DOCUMENTFEED) {
+				return ImeOnDocumentFeed(lParam);
+			}
 			return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
 		}
 
@@ -2022,7 +2064,7 @@ sptr_t ScintillaWin::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
 			UpdateBaseElements();
 			// Get Intellimouse scroll line parameters
 			GetIntelliMouseParameters();
-			::RegisterDragDrop(MainHWND(), reinterpret_cast<IDropTarget *>(&dt));
+			::RegisterDragDrop(MainHWND(), &dt);
 			break;
 
 		case WM_COMMAND:
@@ -2802,97 +2844,82 @@ void ScintillaWin::ClaimSelection() {
 }
 
 /// Implement IUnknown
-
-STDMETHODIMP_(ULONG)FormatEnumerator_AddRef(FormatEnumerator *fe);
-STDMETHODIMP FormatEnumerator_QueryInterface(FormatEnumerator *fe, REFIID riid, PVOID *ppv) {
+STDMETHODIMP FormatEnumerator::QueryInterface(REFIID riid, PVOID *ppv) {
 	//Platform::DebugPrintf("EFE QI");
 	*ppv = nullptr;
-	if (riid == IID_IUnknown)
-		*ppv = reinterpret_cast<IEnumFORMATETC *>(fe);
-	if (riid == IID_IEnumFORMATETC)
-		*ppv = reinterpret_cast<IEnumFORMATETC *>(fe);
-	if (!*ppv)
+	if (riid == IID_IUnknown || riid == IID_IEnumFORMATETC) {
+		*ppv = this;
+	} else {
 		return E_NOINTERFACE;
-	FormatEnumerator_AddRef(fe);
+	}
+	AddRef();
 	return S_OK;
 }
-STDMETHODIMP_(ULONG)FormatEnumerator_AddRef(FormatEnumerator *fe) {
-	return ++fe->ref;
+STDMETHODIMP_(ULONG)FormatEnumerator::AddRef() {
+	return ++ref;
 }
-STDMETHODIMP_(ULONG)FormatEnumerator_Release(FormatEnumerator *fe) {
-	fe->ref--;
-	if (fe->ref > 0)
-		return fe->ref;
-	delete fe;
-	return 0;
+STDMETHODIMP_(ULONG)FormatEnumerator::Release() {
+	const ULONG refs = --ref;
+	if (refs == 0) {
+		delete this;
+	}
+	return refs;
 }
 /// Implement IEnumFORMATETC
-STDMETHODIMP FormatEnumerator_Next(FormatEnumerator *fe, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) {
+STDMETHODIMP FormatEnumerator::Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) {
 	if (!rgelt) return E_POINTER;
 	ULONG putPos = 0;
-	while ((fe->pos < fe->formats.size()) && (putPos < celt)) {
-		rgelt->cfFormat = fe->formats[fe->pos];
+	while ((pos < formats.size()) && (putPos < celt)) {
+		rgelt->cfFormat = formats[pos];
 		rgelt->ptd = nullptr;
 		rgelt->dwAspect = DVASPECT_CONTENT;
 		rgelt->lindex = -1;
 		rgelt->tymed = TYMED_HGLOBAL;
 		rgelt++;
-		fe->pos++;
+		pos++;
 		putPos++;
 	}
 	if (pceltFetched)
 		*pceltFetched = putPos;
 	return putPos ? S_OK : S_FALSE;
 }
-STDMETHODIMP FormatEnumerator_Skip(FormatEnumerator *fe, ULONG celt) {
-	fe->pos += celt;
+STDMETHODIMP FormatEnumerator::Skip(ULONG celt) {
+	pos += celt;
 	return S_OK;
 }
-STDMETHODIMP FormatEnumerator_Reset(FormatEnumerator *fe) {
-	fe->pos = 0;
+STDMETHODIMP FormatEnumerator::Reset() {
+	pos = 0;
 	return S_OK;
 }
-STDMETHODIMP FormatEnumerator_Clone(FormatEnumerator *fe, IEnumFORMATETC **ppenum) {
+STDMETHODIMP FormatEnumerator::Clone(IEnumFORMATETC **ppenum) {
 	FormatEnumerator *pfe;
 	try {
-		pfe = new FormatEnumerator(fe->pos, &fe->formats[0], fe->formats.size());
+		pfe = new FormatEnumerator(pos, &formats[0], formats.size());
 	} catch (...) {
 		return E_OUTOFMEMORY;
 	}
-	return FormatEnumerator_QueryInterface(pfe, IID_IEnumFORMATETC,
-	                                       reinterpret_cast<void **>(ppenum));
+	return pfe->QueryInterface(IID_IEnumFORMATETC, reinterpret_cast<void **>(ppenum));
 }
 
-static VFunction *vtFormatEnumerator[] = {
-	(VFunction *)(FormatEnumerator_QueryInterface),
-	(VFunction *)(FormatEnumerator_AddRef),
-	(VFunction *)(FormatEnumerator_Release),
-	(VFunction *)(FormatEnumerator_Next),
-	(VFunction *)(FormatEnumerator_Skip),
-	(VFunction *)(FormatEnumerator_Reset),
-	(VFunction *)(FormatEnumerator_Clone)
-};
-
 FormatEnumerator::FormatEnumerator(ULONG pos_, const CLIPFORMAT formats_[], size_t formatsLen_) {
-	vtbl = vtFormatEnumerator;
 	ref = 0;   // First QI adds first reference...
 	pos = pos_;
 	formats.insert(formats.begin(), formats_, formats_+formatsLen_);
 }
 
 /// Implement IUnknown
-STDMETHODIMP DropSource_QueryInterface(DropSource *ds, REFIID riid, PVOID *ppv) {
-	return ds->sci->QueryInterface(riid, ppv);
+STDMETHODIMP DropSource::QueryInterface(REFIID riid, PVOID *ppv) {
+	return sci->QueryInterface(riid, ppv);
 }
-STDMETHODIMP_(ULONG)DropSource_AddRef(DropSource *ds) {
-	return ds->sci->AddRef();
+STDMETHODIMP_(ULONG)DropSource::AddRef() {
+	return sci->AddRef();
 }
-STDMETHODIMP_(ULONG)DropSource_Release(DropSource *ds) {
-	return ds->sci->Release();
+STDMETHODIMP_(ULONG)DropSource::Release() {
+	return sci->Release();
 }
 
 /// Implement IDropSource
-STDMETHODIMP DropSource_QueryContinueDrag(DropSource *, BOOL fEsc, DWORD grfKeyState) {
+STDMETHODIMP DropSource::QueryContinueDrag(BOOL fEsc, DWORD grfKeyState) {
 	if (fEsc)
 		return DRAGDROP_S_CANCEL;
 	if (!(grfKeyState & MK_LBUTTON))
@@ -2900,46 +2927,33 @@ STDMETHODIMP DropSource_QueryContinueDrag(DropSource *, BOOL fEsc, DWORD grfKeyS
 	return S_OK;
 }
 
-STDMETHODIMP DropSource_GiveFeedback(DropSource *, DWORD) {
+STDMETHODIMP DropSource::GiveFeedback(DWORD) {
 	return DRAGDROP_S_USEDEFAULTCURSORS;
 }
 
-static VFunction *vtDropSource[] = {
-	(VFunction *)(DropSource_QueryInterface),
-	(VFunction *)(DropSource_AddRef),
-	(VFunction *)(DropSource_Release),
-	(VFunction *)(DropSource_QueryContinueDrag),
-	(VFunction *)(DropSource_GiveFeedback)
-};
-
-DropSource::DropSource() noexcept {
-	vtbl = vtDropSource;
-	sci = nullptr;
-}
-
 /// Implement IUnkown
-STDMETHODIMP DataObject_QueryInterface(DataObject *pd, REFIID riid, PVOID *ppv) {
-	//Platform::DebugPrintf("DO QI %x\n", pd);
-	return pd->sci->QueryInterface(riid, ppv);
+STDMETHODIMP DataObject::QueryInterface(REFIID riid, PVOID *ppv) {
+	//Platform::DebugPrintf("DO QI %p\n", this);
+	return sci->QueryInterface(riid, ppv);
 }
-STDMETHODIMP_(ULONG)DataObject_AddRef(DataObject *pd) {
-	return pd->sci->AddRef();
+STDMETHODIMP_(ULONG)DataObject::AddRef() {
+	return sci->AddRef();
 }
-STDMETHODIMP_(ULONG)DataObject_Release(DataObject *pd) {
-	return pd->sci->Release();
+STDMETHODIMP_(ULONG)DataObject::Release() {
+	return sci->Release();
 }
 /// Implement IDataObject
-STDMETHODIMP DataObject_GetData(DataObject *pd, FORMATETC *pFEIn, STGMEDIUM *pSTM) {
-	return pd->sci->GetData(pFEIn, pSTM);
+STDMETHODIMP DataObject::GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) {
+	return sci->GetData(pFEIn, pSTM);
 }
 
-STDMETHODIMP DataObject_GetDataHere(DataObject *, FORMATETC *, STGMEDIUM *) {
+STDMETHODIMP DataObject::GetDataHere(FORMATETC *, STGMEDIUM *) {
 	//Platform::DebugPrintf("DOB GetDataHere\n");
 	return E_NOTIMPL;
 }
 
-STDMETHODIMP DataObject_QueryGetData(DataObject *pd, FORMATETC *pFE) {
-	if (pd->sci->DragIsRectangularOK(pFE->cfFormat) && IsValidFormatEtc(pFE)) {
+STDMETHODIMP DataObject::QueryGetData(FORMATETC *pFE) {
+	if (sci->DragIsRectangularOK(pFE->cfFormat) && IsValidFormatEtc(pFE)) {
 		return S_OK;
 	}
 
@@ -2950,7 +2964,7 @@ STDMETHODIMP DataObject_QueryGetData(DataObject *pd, FORMATETC *pFE) {
 	}
 }
 
-STDMETHODIMP DataObject_GetCanonicalFormatEtc(DataObject *, FORMATETC *, FORMATETC *pFEOut) {
+STDMETHODIMP DataObject::GetCanonicalFormatEtc(FORMATETC *, FORMATETC *pFEOut) {
 	//Platform::DebugPrintf("DOB GetCanon\n");
 	pFEOut->cfFormat = CF_UNICODETEXT;
 	pFEOut->ptd = nullptr;
@@ -2960,12 +2974,12 @@ STDMETHODIMP DataObject_GetCanonicalFormatEtc(DataObject *, FORMATETC *, FORMATE
 	return S_OK;
 }
 
-STDMETHODIMP DataObject_SetData(DataObject *, FORMATETC *, STGMEDIUM *, BOOL) {
+STDMETHODIMP DataObject::SetData(FORMATETC *, STGMEDIUM *, BOOL) {
 	//Platform::DebugPrintf("DOB SetData\n");
 	return E_FAIL;
 }
 
-STDMETHODIMP DataObject_EnumFormatEtc(DataObject *pd, DWORD dwDirection, IEnumFORMATETC **ppEnum) {
+STDMETHODIMP DataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnum) {
 	try {
 		//Platform::DebugPrintf("DOB EnumFormatEtc %d\n", dwDirection);
 		if (dwDirection != DATADIR_GET) {
@@ -2975,115 +2989,77 @@ STDMETHODIMP DataObject_EnumFormatEtc(DataObject *pd, DWORD dwDirection, IEnumFO
 
 		const CLIPFORMAT formats[] = {CF_UNICODETEXT};
 		FormatEnumerator *pfe = new FormatEnumerator(0, formats, std::size(formats));
-		return FormatEnumerator_QueryInterface(pfe, IID_IEnumFORMATETC,
-											   reinterpret_cast<void **>(ppEnum));
+		return pfe->QueryInterface(IID_IEnumFORMATETC, reinterpret_cast<void **>(ppEnum));
 	} catch (std::bad_alloc &) {
-		pd->sci->errorStatus = Status::BadAlloc;
+		sci->errorStatus = Status::BadAlloc;
 		return E_OUTOFMEMORY;
 	} catch (...) {
-		pd->sci->errorStatus = Status::Failure;
+		sci->errorStatus = Status::Failure;
 		return E_FAIL;
 	}
 }
 
-STDMETHODIMP DataObject_DAdvise(DataObject *, FORMATETC *, DWORD, IAdviseSink *, PDWORD) {
+STDMETHODIMP DataObject::DAdvise(FORMATETC *, DWORD, IAdviseSink *, PDWORD) {
 	//Platform::DebugPrintf("DOB DAdvise\n");
 	return E_FAIL;
 }
 
-STDMETHODIMP DataObject_DUnadvise(DataObject *, DWORD) {
+STDMETHODIMP DataObject::DUnadvise(DWORD) {
 	//Platform::DebugPrintf("DOB DUnadvise\n");
 	return E_FAIL;
 }
 
-STDMETHODIMP DataObject_EnumDAdvise(DataObject *, IEnumSTATDATA **) {
+STDMETHODIMP DataObject::EnumDAdvise(IEnumSTATDATA **) {
 	//Platform::DebugPrintf("DOB EnumDAdvise\n");
 	return E_FAIL;
 }
 
-static VFunction *vtDataObject[] = {
-	(VFunction *)(DataObject_QueryInterface),
-	(VFunction *)(DataObject_AddRef),
-	(VFunction *)(DataObject_Release),
-	(VFunction *)(DataObject_GetData),
-	(VFunction *)(DataObject_GetDataHere),
-	(VFunction *)(DataObject_QueryGetData),
-	(VFunction *)(DataObject_GetCanonicalFormatEtc),
-	(VFunction *)(DataObject_SetData),
-	(VFunction *)(DataObject_EnumFormatEtc),
-	(VFunction *)(DataObject_DAdvise),
-	(VFunction *)(DataObject_DUnadvise),
-	(VFunction *)(DataObject_EnumDAdvise)
-};
-
-DataObject::DataObject() noexcept {
-	vtbl = vtDataObject;
-	sci = nullptr;
-}
-
 /// Implement IUnknown
-STDMETHODIMP DropTarget_QueryInterface(DropTarget *dt, REFIID riid, PVOID *ppv) {
-	//Platform::DebugPrintf("DT QI %x\n", dt);
-	return dt->sci->QueryInterface(riid, ppv);
+STDMETHODIMP DropTarget::QueryInterface(REFIID riid, PVOID *ppv) {
+	//Platform::DebugPrintf("DT QI %p\n", this);
+	return sci->QueryInterface(riid, ppv);
 }
-STDMETHODIMP_(ULONG)DropTarget_AddRef(DropTarget *dt) {
-	return dt->sci->AddRef();
+STDMETHODIMP_(ULONG)DropTarget::AddRef() {
+	return sci->AddRef();
 }
-STDMETHODIMP_(ULONG)DropTarget_Release(DropTarget *dt) {
-	return dt->sci->Release();
+STDMETHODIMP_(ULONG)DropTarget::Release() {
+	return sci->Release();
 }
 
 /// Implement IDropTarget by forwarding to Scintilla
-STDMETHODIMP DropTarget_DragEnter(DropTarget *dt, LPDATAOBJECT pIDataSource, DWORD grfKeyState,
-                                  POINTL pt, PDWORD pdwEffect) {
+STDMETHODIMP DropTarget::DragEnter(LPDATAOBJECT pIDataSource, DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) {
 	try {
-		return dt->sci->DragEnter(pIDataSource, grfKeyState, pt, pdwEffect);
+		return sci->DragEnter(pIDataSource, grfKeyState, pt, pdwEffect);
 	} catch (...) {
-		dt->sci->errorStatus = Status::Failure;
+		sci->errorStatus = Status::Failure;
 	}
 	return E_FAIL;
 }
-STDMETHODIMP DropTarget_DragOver(DropTarget *dt, DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) {
+STDMETHODIMP DropTarget::DragOver(DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) {
 	try {
-		return dt->sci->DragOver(grfKeyState, pt, pdwEffect);
+		return sci->DragOver(grfKeyState, pt, pdwEffect);
 	} catch (...) {
-		dt->sci->errorStatus = Status::Failure;
+		sci->errorStatus = Status::Failure;
 	}
 	return E_FAIL;
 }
-STDMETHODIMP DropTarget_DragLeave(DropTarget *dt) {
+STDMETHODIMP DropTarget::DragLeave() {
 	try {
-		return dt->sci->DragLeave();
+		return sci->DragLeave();
 	} catch (...) {
-		dt->sci->errorStatus = Status::Failure;
+		sci->errorStatus = Status::Failure;
 	}
 	return E_FAIL;
 }
-STDMETHODIMP DropTarget_Drop(DropTarget *dt, LPDATAOBJECT pIDataSource, DWORD grfKeyState,
-                             POINTL pt, PDWORD pdwEffect) {
+STDMETHODIMP DropTarget::Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) {
 	try {
-		return dt->sci->Drop(pIDataSource, grfKeyState, pt, pdwEffect);
+		return sci->Drop(pIDataSource, grfKeyState, pt, pdwEffect);
 	} catch (...) {
-		dt->sci->errorStatus = Status::Failure;
+		sci->errorStatus = Status::Failure;
 	}
 	return E_FAIL;
 }
 
-static VFunction *vtDropTarget[] = {
-	(VFunction *)(DropTarget_QueryInterface),
-	(VFunction *)(DropTarget_AddRef),
-	(VFunction *)(DropTarget_Release),
-	(VFunction *)(DropTarget_DragEnter),
-	(VFunction *)(DropTarget_DragOver),
-	(VFunction *)(DropTarget_DragLeave),
-	(VFunction *)(DropTarget_Drop)
-};
-
-DropTarget::DropTarget() noexcept {
-	vtbl = vtDropTarget;
-	sci = nullptr;
-}
-
 /**
  * DBCS: support Input Method Editor (IME).
  * Called when IME Window opened.
@@ -3216,6 +3192,50 @@ LRESULT ScintillaWin::ImeOnReconvert(LPARAM lParam) {
 	return rcSize;
 }
 
+LRESULT ScintillaWin::ImeOnDocumentFeed(LPARAM lParam) const {
+	// This is called while typing preedit string in.
+	// So there is no selection.
+	// Limit feed within one line without EOL.
+	// Look around:   lineStart |<--  |compStart| - caret - compEnd|  -->| lineEnd.
+
+	const Sci::Position curPos = CurrentPosition();
+	const Sci::Line curLine = pdoc->SciLineFromPosition(curPos);
+	const Sci::Position lineStart = pdoc->LineStart(curLine);
+	const Sci::Position lineEnd = pdoc->LineEnd(curLine);
+
+	const std::wstring rcFeed = StringDecode(RangeText(lineStart, lineEnd), CodePageOfDocument());
+	const int rcFeedLen = static_cast<int>(rcFeed.length()) * sizeof(wchar_t);
+	const int rcSize = sizeof(RECONVERTSTRING) + rcFeedLen + sizeof(wchar_t);
+
+	RECONVERTSTRING *rc = static_cast<RECONVERTSTRING *>(PtrFromSPtr(lParam));
+	if (!rc)
+		return rcSize;
+
+	wchar_t *rcFeedStart = reinterpret_cast<wchar_t*>(rc + 1);
+	memcpy(rcFeedStart, &rcFeed[0], rcFeedLen);
+
+	IMContext imc(MainHWND());
+	if (!imc.hIMC)
+		return 0;
+
+	const size_t compStrLen = imc.GetCompositionString(GCS_COMPSTR).size();
+	const int imeCaretPos = imc.GetImeCaretPos();
+	const Sci::Position compStart = pdoc->GetRelativePositionUTF16(curPos, -imeCaretPos);
+	const Sci::Position compStrOffset = pdoc->CountUTF16(lineStart, compStart);
+
+	// Fill in reconvert structure.
+	// Let IME to decide what the target is.
+	rc->dwVersion = 0; //constant
+	rc->dwStrLen = static_cast<DWORD>(rcFeed.length());
+	rc->dwStrOffset = sizeof(RECONVERTSTRING); //constant
+	rc->dwCompStrLen = static_cast<DWORD>(compStrLen);
+	rc->dwCompStrOffset = static_cast<DWORD>(compStrOffset) * sizeof(wchar_t);
+	rc->dwTargetStrLen = rc->dwCompStrLen;
+	rc->dwTargetStrOffset = rc->dwCompStrOffset;
+
+	return rcSize; // MS API says reconv structure to be returned.
+}
+
 void ScintillaWin::GetIntelliMouseParameters() noexcept {
 	// This retrieves the number of lines per scroll as configured in the Mouse Properties sheet in Control Panel
 	::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &linesPerScroll, 0);
@@ -3411,14 +3431,15 @@ DWORD ScintillaWin::EffectFromState(DWORD grfKeyState) const noexcept {
 /// Implement IUnknown
 STDMETHODIMP ScintillaWin::QueryInterface(REFIID riid, PVOID *ppv) {
 	*ppv = nullptr;
-	if (riid == IID_IUnknown)
-		*ppv = reinterpret_cast<IDropTarget *>(&dt);
-	if (riid == IID_IDropSource)
-		*ppv = reinterpret_cast<IDropSource *>(&ds);
-	if (riid == IID_IDropTarget)
-		*ppv = reinterpret_cast<IDropTarget *>(&dt);
-	if (riid == IID_IDataObject)
-		*ppv = reinterpret_cast<IDataObject *>(&dob);
+	if (riid == IID_IUnknown) {
+		*ppv = &dt;
+	} else if (riid == IID_IDropSource) {
+		*ppv = &ds;
+	} else if (riid == IID_IDropTarget) {
+		*ppv = &dt;
+	} else if (riid == IID_IDataObject) {
+		*ppv = &dob;
+	}
 	if (!*ppv)
 		return E_NOINTERFACE;
 	return S_OK;
diff --git a/scintilla/win32/makefile b/scintilla/win32/makefile
index 36a22fe02cef..7f6c4bea2ab4 100644
--- a/scintilla/win32/makefile
+++ b/scintilla/win32/makefile
@@ -45,7 +45,7 @@ vpath %.h ../src ../include
 vpath %.cxx ../src
 
 LDFLAGS=-shared -static -mwindows
-LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW)
+LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 $(LIBSMINGW)
 
 INCLUDES=-I ../include -I ../src
 
diff --git a/scintilla/win32/scintilla.mak b/scintilla/win32/scintilla.mak
index 2031b19ecbfd..3ac956df031f 100644
--- a/scintilla/win32/scintilla.mak
+++ b/scintilla/win32/scintilla.mak
@@ -42,7 +42,7 @@ CXXNDEBUG=-O2 -MT -DNDEBUG -GL
 NAME=-Fo
 LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(SUBSYSTEM) $(CETCOMPAT)
 LDDEBUG=
-LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.lib OLEAUT32.lib MSIMG32.lib
+LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.lib OLEAUT32.lib
 NOLOGO=-nologo
 
 !IFDEF QUIET