diff --git a/language/common_res.h b/language/common_res.h
index 50628793b..380c2c367 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -667,6 +667,7 @@
#define IDS_LEX_NIM_SRC 63044
#define IDS_LEX_R_STAT 63045
#define IDS_LEX_RUST_SRC 63046
+#define IDS_LEX_AHKL 63047
#define IDS_LEX_STD_STYLE 63100
#define IDS_LEX_STD_MARGIN 63101
@@ -916,5 +917,10 @@
#define IDS_LEX_STR_63344 63344
#define IDS_LEX_STR_63345 63345
#define IDS_LEX_STR_63346 63346
+#define IDS_LEX_STR_63347 63347
+#define IDS_LEX_STR_63348 63348
+#define IDS_LEX_STR_63349 63349
+#define IDS_LEX_STR_63350 63350
+#define IDS_LEX_STR_63351 63351
#endif //_COMMON_RES_H_
diff --git a/language/np3_af_za/lexer_af_za.rc b/language/np3_af_za/lexer_af_za.rc
index ef1349ecd..3961710aa 100644
Binary files a/language/np3_af_za/lexer_af_za.rc and b/language/np3_af_za/lexer_af_za.rc differ
diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc
index b638a9c6a..8ab2de343 100644
Binary files a/language/np3_de_de/lexer_de_de.rc and b/language/np3_de_de/lexer_de_de.rc differ
diff --git a/language/np3_en_gb/lexer_en_gb.rc b/language/np3_en_gb/lexer_en_gb.rc
index b3c7b13c0..19d5feb16 100644
Binary files a/language/np3_en_gb/lexer_en_gb.rc and b/language/np3_en_gb/lexer_en_gb.rc differ
diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc
index 854c09afe..bd86276f6 100644
Binary files a/language/np3_en_us/lexer_en_us.rc and b/language/np3_en_us/lexer_en_us.rc differ
diff --git a/language/np3_es_es/lexer_es_es.rc b/language/np3_es_es/lexer_es_es.rc
index d36a3bb4c..576a5fc9c 100644
Binary files a/language/np3_es_es/lexer_es_es.rc and b/language/np3_es_es/lexer_es_es.rc differ
diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc
index ce7907c55..86e7714ba 100644
Binary files a/language/np3_fr_fr/lexer_fr_fr.rc and b/language/np3_fr_fr/lexer_fr_fr.rc differ
diff --git a/language/np3_ja_jp/lexer_ja_jp.rc b/language/np3_ja_jp/lexer_ja_jp.rc
index 1acd99e1c..499c104a6 100644
Binary files a/language/np3_ja_jp/lexer_ja_jp.rc and b/language/np3_ja_jp/lexer_ja_jp.rc differ
diff --git a/language/np3_nl_nl/lexer_nl_nl.rc b/language/np3_nl_nl/lexer_nl_nl.rc
index 509f27e87..da0d651d9 100644
Binary files a/language/np3_nl_nl/lexer_nl_nl.rc and b/language/np3_nl_nl/lexer_nl_nl.rc differ
diff --git a/language/np3_zh_cn/lexer_zh_cn.rc b/language/np3_zh_cn/lexer_zh_cn.rc
index 5cf2a7557..15dfddd0d 100644
Binary files a/language/np3_zh_cn/lexer_zh_cn.rc and b/language/np3_zh_cn/lexer_zh_cn.rc differ
diff --git a/sciXlexers/SciXLexer.h b/sciXlexers/SciXLexer.h
index 362680426..8afafd00b 100644
--- a/sciXlexers/SciXLexer.h
+++ b/sciXlexers/SciXLexer.h
@@ -1,8 +1,11 @@
#ifndef SCIXLEXER_H
#define SCIXLEXER_H
-#define SCLEX_AHK 200
+#define SCLEX_AHK 200
+#define SCLEX_AHKL 201
+// -----------------------------------------------------------------------------
+// !!!!! ADD Lexer Linkage in: Notepad3\scintilla\src\Catalogue.cxx !!!!!
// -----------------------------------------------------------------------------
#define SCE_AHK_DEFAULT 0
@@ -27,4 +30,36 @@
#define SCE_AHK_VARREFKW 19
#define SCE_AHK_ERROR 20
+#define SCE_AHKL_NEUTRAL 0
+#define SCE_AHKL_IDENTIFIER 1
+#define SCE_AHKL_COMMENTDOC 2
+#define SCE_AHKL_COMMENTLINE 3
+#define SCE_AHKL_COMMENTBLOCK 4
+#define SCE_AHKL_COMMENTKEYWORD 5
+#define SCE_AHKL_STRING 6
+#define SCE_AHKL_STRINGOPTS 7
+#define SCE_AHKL_STRINGBLOCK 8
+#define SCE_AHKL_STRINGCOMMENT 9
+#define SCE_AHKL_LABEL 10
+#define SCE_AHKL_HOTKEY 11
+#define SCE_AHKL_HOTSTRING 12
+#define SCE_AHKL_HOTSTRINGOPT 13
+#define SCE_AHKL_HEXNUMBER 14
+#define SCE_AHKL_DECNUMBER 15
+#define SCE_AHKL_VAR 16
+#define SCE_AHKL_VARREF 17
+#define SCE_AHKL_OBJECT 18
+#define SCE_AHKL_USERFUNCTION 19
+#define SCE_AHKL_DIRECTIVE 20
+#define SCE_AHKL_COMMAND 21
+#define SCE_AHKL_PARAM 22
+#define SCE_AHKL_CONTROLFLOW 23
+#define SCE_AHKL_BUILTINFUNCTION 24
+#define SCE_AHKL_BUILTINVAR 25
+#define SCE_AHKL_KEY 26
+#define SCE_AHKL_USERDEFINED1 27
+#define SCE_AHKL_USERDEFINED2 28
+#define SCE_AHKL_ESCAPESEQ 30
+#define SCE_AHKL_ERROR 31
+
#endif
diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj
index e9d0f2a25..0e438f783 100644
--- a/scintilla/Scintilla.vcxproj
+++ b/scintilla/Scintilla.vcxproj
@@ -265,6 +265,7 @@
+
diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters
index 701ad07c7..50fadafa9 100644
--- a/scintilla/Scintilla.vcxproj.filters
+++ b/scintilla/Scintilla.vcxproj.filters
@@ -453,6 +453,9 @@
sciXlexers
+
+ sciXlexers
+
diff --git a/scintilla/src/Catalogue.cxx b/scintilla/src/Catalogue.cxx
index 12b2e3975..9dcedac4d 100644
--- a/scintilla/src/Catalogue.cxx
+++ b/scintilla/src/Catalogue.cxx
@@ -76,6 +76,7 @@ int Scintilla_LinkLexers() {
//LINK_LEXER(lmAbaqus);
//LINK_LEXER(lmAda);
LINK_LEXER(lmAHK);
+ LINK_LEXER(lmAHKL);
//LINK_LEXER(lmAPDL);
//LINK_LEXER(lmAs);
LINK_LEXER(lmAsm);
diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj
index 3abd8f226..18649a76d 100644
--- a/src/Notepad3.vcxproj
+++ b/src/Notepad3.vcxproj
@@ -375,6 +375,7 @@
+
diff --git a/src/Notepad3.vcxproj.filters b/src/Notepad3.vcxproj.filters
index dfed41470..8383e6a9c 100644
--- a/src/Notepad3.vcxproj.filters
+++ b/src/Notepad3.vcxproj.filters
@@ -243,6 +243,9 @@
StyleLexers
+
+ StyleLexers
+
diff --git a/src/StyleLexers/EditLexer.h b/src/StyleLexers/EditLexer.h
index 380fa37fa..a28b7bdc2 100644
--- a/src/StyleLexers/EditLexer.h
+++ b/src/StyleLexers/EditLexer.h
@@ -59,6 +59,7 @@ extern EDITLEXER lexANSI; // ANSI Files
extern EDITLEXER lexCONF; // Apache Config Files
extern EDITLEXER lexASM; // Assembly Script
extern EDITLEXER lexAHK; // AutoHotkey Script
+extern EDITLEXER lexAHKL; // AutoHotkey L Script
extern EDITLEXER lexAU3; // AutoIt3 Script
extern EDITLEXER lexAVS; // AviSynth Script
extern EDITLEXER lexAwk; // Awk Script
diff --git a/src/StyleLexers/styleLexAHK.c b/src/StyleLexers/styleLexAHK.c
index ac3d81153..9ab79fb2b 100644
--- a/src/StyleLexers/styleLexAHK.c
+++ b/src/StyleLexers/styleLexAHK.c
@@ -108,7 +108,7 @@ KEYWORDLIST KeyWords_AHK = {
EDITLEXER lexAHK = {
-SCLEX_AHK, IDS_LEX_AHK, L"AutoHotkey Script", L"ahk; ia; scriptlet", L"",
+SCLEX_AHK, IDS_LEX_AHK, L"AutoHotkey Script", L"", L"",
&KeyWords_AHK, {
{ STYLE_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" },
//{ SCE_AHK_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" },
diff --git a/src/Styles.c b/src/Styles.c
index 34ed92055..39a7ee290 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -111,6 +111,7 @@ static PEDITLEXER g_pLexArray[NUMLEXERS] =
&lexCONF, // Apache Config Files
&lexASM, // Assembly Script
&lexAHK, // AutoHotkey Script
+ &lexAHKL, // AutoHotkey L Script
&lexAU3, // AutoIt3 Script
&lexAVS, // AviSynth Script
&lexAwk, // Awk Script
diff --git a/src/Styles.h b/src/Styles.h
index 7a4bc3382..a4ecc7c83 100644
--- a/src/Styles.h
+++ b/src/Styles.h
@@ -25,7 +25,7 @@
#define MARGIN_SCI_FOLDING 2
// Number of Lexers in pLexArray
-#define NUMLEXERS 48
+#define NUMLEXERS 49
#define AVG_NUM_OF_STYLES_PER_LEXER 20
diff --git a/test/TestAhkNotepad3.ahk b/test/TestAhkNotepad3.ahk
index f7c8cbbb6..2703b30f6 100644
--- a/test/TestAhkNotepad3.ahk
+++ b/test/TestAhkNotepad3.ahk
@@ -43,7 +43,7 @@ Goto LABEL_END
; =============================================================================
; =============================================================================
-CHECK_NP3_STARTS:
+CHECK_NP3_STARTS:
; check that NP3 starts up
WinWait ahk_pid %v_Notepad3_PID%, , 3
v_ErrLevel = %ErrorLevel%