diff --git a/src/languages/nsis.js b/src/languages/nsis.js
index 80de3dea6d..ec58a603a7 100644
--- a/src/languages/nsis.js
+++ b/src/languages/nsis.js
@@ -19,11 +19,11 @@ export default {
 			},
 			'keyword': {
 				pattern:
-					/(^[\t ]*)(?:Abort|Add(?:BrandingImage|Size)|AdvSplash|Allow(?:RootDirInstall|SkipFiles)|AutoCloseWindow|BG(?:Font|Gradient|Image)|Banner|BrandingText|BringToFront|CRCCheck|Call(?:InstDLL)?|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|Create(?:Directory|Font|ShortCut)|Delete(?:INISec|INIStr|RegKey|RegValue)?|Detail(?:Print|sButtonText)|Dialer|Dir(?:Text|Var|Verify)|EnableWindow|Enum(?:RegKey|RegValue)|Exch|Exec(?:Shell(?:Wait)?|Wait)?|ExpandEnvStrings|File(?:BufSize|Close|ErrorText|Open|Read|ReadByte|ReadUTF16LE|ReadWord|Seek|Write|WriteByte|WriteUTF16LE|WriteWord)?|Find(?:Close|First|Next|Window)|FlushINI|Get(?:CurInstType|CurrentAddress|DLLVersion(?:Local)?|DlgItem|ErrorLevel|FileTime(?:Local)?|FullPathName|Function(?:Address|End)?|InstDirError|KnownFolderPath|LabelAddress|TempFileName|WinVer)|Goto|HideWindow|Icon|If(?:Abort|Errors|FileExists|RebootFlag|RtlLanguage|ShellVarContextAll|Silent)|InitPluginsDir|InstProgressFlags|Inst(?:Type(?:GetText|SetText)?)|Install(?:ButtonText|Colors|Dir(?:RegKey)?)|Int(?:64|Ptr)?CmpU?|Int(?:64)?Fmt|Int(?:Ptr)?Op|IsWindow|Lang(?:DLL|String)|License(?:BkColor|Data|ForceSelection|LangString|Text)|LoadLanguageFile|LockWindow|Log(?:Set|Text)|Manifest(?:DPIAware|SupportedOS)|Math|MessageBox|MiscButtonText|NSISdl|Name|Nop|OutFile|PE(?:DllCharacteristics|SubsysVer)|Page(?:Callbacks)?|Pop|Push|Quit|RMDir|Read(?:EnvStr|INIStr|RegDWORD|RegStr)|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|SearchPath|Section(?:End|GetFlags|GetInstTypes|GetSize|GetText|Group|In|SetFlags|SetInstTypes|SetSize|SetText)?|SendMessage|Set(?:AutoClose|BrandingImage|Compress|Compressor(?:DictSize)?|CtlColors|CurInstType|DatablockOptimize|DateSave|Details(?:Print|View)|ErrorLevel|Errors|FileAttributes|Font|OutPath|Overwrite|PluginUnload|RebootFlag|RegView|ShellVarContext|Silent)|Show(?:InstDetails|UninstDetails|Window)|Silent(?:Install|UnInstall)|Sleep|SpaceTexts|Splash|StartMenu|Str(?:CmpS?|Cpy|Len)|SubCaption|System|Target|UnRegDLL|Unicode|UninstPage|Uninstall(?:ButtonText|Caption|Icon|SubCaption|Text)|UserInfo|VI(?:AddVersionKey|FileVersion|ProductVersion)|VPatch|Var|WindowIcon|Write(?:INIStr|Reg(?:Bin|DWORD|ExpandStr|MultiStr|None|Str)|Uninstaller)|XPStyle|ns(?:Dialogs|Exec))\b/m,
+					/(^[\t ]*)(?:Abort|Add(?:BrandingImage|Size)|AdvSplash|Allow(?:RootDirInstall|SkipFiles)|AutoCloseWindow|BG(?:Font|Gradient|Image)|Banner|BrandingText|BringToFront|CPU|CRCCheck|Call(?:InstDLL)?|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|Create(?:Directory|Font|ShortCut)|Delete(?:INISec|INIStr|RegKey|RegValue)?|Detail(?:Print|sButtonText)|Dialer|Dir(?:Text|Var|Verify)|EnableWindow|Enum(?:RegKey|RegValue)|Exch|Exec(?:Shell(?:Wait)?|Wait)?|ExpandEnvStrings|File(?:BufSize|Close|ErrorText|Open|Read|ReadByte|ReadUTF16LE|ReadWord|Seek|Write|WriteByte|WriteUTF16LE|WriteWord)?|Find(?:Close|First|Next|Window)|FlushINI|Function(?:End)?|Get(?:CurInstType|CurrentAddress|DLLVersion(?:Local)?|DlgItem|ErrorLevel|FileTime(?:Local)?|FullPathName|Function(?:Address|End)?|InstDirError|KnownFolderPath|LabelAddress|RegView|ShellVarContext|TempFileName|WinVer)|Goto|HideWindow|Icon|If(?:Abort|AltRegView|Errors|FileExists|RebootFlag|RtlLanguage|ShellVarContextAll|Silent)|InitPluginsDir|InstProgressFlags|Inst(?:Type(?:GetText|SetText)?)|Install(?:ButtonText|Colors|Dir(?:RegKey)?)|Int(?:64|Ptr)?CmpU?|Int(?:64)?Fmt|Int(?:Ptr)?Op|IsWindow|Lang(?:DLL|String)|License(?:BkColor|Data|ForceSelection|LangString|Text)|Load(?:AndSetImage|LanguageFile)|LockWindow|Log(?:Set|Text)|Manifest(?:AppendCustomString|DPIAware(?:ness)?|DisableWindowFiltering|GdiScaling|LongPathAware|MaxVersionTested|SupportedOS)|Math|MessageBox|MiscButtonText|NSISdl|Name|Nop|OutFile|PE(?:AddResource|DllCharacteristics|RemoveResource|SubsysVer)|Page(?:Callbacks|Ex(?:End)?)?|Pop|Push|Quit|RMDir|Read(?:EnvStr|INIStr|Memory|RegDWORD|RegStr)|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|SearchPath|Section(?:End|GetFlags|GetInstTypes|GetSize|GetText|Group(?:End)?|In(?:stType)?|SetFlags|SetInstTypes|SetSize|SetText)?|SendMessage|Set(?:AutoClose|BrandingImage|Compress(?:ionLevel|or(?:DictSize)?)?|CtlColors|CurInstType|DatablockOptimize|DateSave|Details(?:Print|View)|ErrorLevel|Errors|FileAttributes|Font|OutPath|Overwrite|PluginUnload|RebootFlag|RegView|ShellVarContext|Silent)|Show(?:InstDetails|UninstDetails|Window)|Silent(?:Install|UnInstall)|Sleep|SpaceTexts|Splash|StartMenu|Str(?:CmpS?|Cpy|Len)|SubCaption|System|Target|UnRegDLL|Unicode|UninstPage|Uninstall(?:ButtonText|Caption|Icon|SubCaption|Text)|UnsafeStrCpy|UserInfo|VI(?:AddVersionKey|FileVersion|ProductVersion)|VPatch|Var|WindowIcon|Write(?:INIStr|Reg(?:Bin|DWORD|ExpandStr|MultiStr|None|Str)|Uninstaller)|XPStyle|ns(?:Dialogs|Exec))\b/m,
 				lookbehind: true,
 			},
 			'property':
-				/\b(?:ARCHIVE|FILE_(?:ATTRIBUTE_ARCHIVE|ATTRIBUTE_NORMAL|ATTRIBUTE_OFFLINE|ATTRIBUTE_READONLY|ATTRIBUTE_SYSTEM|ATTRIBUTE_TEMPORARY)|HK(?:(?:CR|CU|LM)(?:32|64)?|DD|PD|U)|HKEY_(?:CLASSES_ROOT|CURRENT_CONFIG|CURRENT_USER|DYN_DATA|LOCAL_MACHINE|PERFORMANCE_DATA|USERS)|ID(?:ABORT|CANCEL|IGNORE|NO|OK|RETRY|YES)|MB_(?:ABORTRETRYIGNORE|DEFBUTTON1|DEFBUTTON2|DEFBUTTON3|DEFBUTTON4|ICONEXCLAMATION|ICONINFORMATION|ICONQUESTION|ICONSTOP|OK|OKCANCEL|RETRYCANCEL|RIGHT|RTLREADING|SETFOREGROUND|TOPMOST|USERICON|YESNO)|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY|admin|all|auto|both|colored|false|force|hide|highest|lastused|leave|listonly|none|normal|notset|off|on|open|print|show|silent|silentlog|smooth|textonly|true|user)\b/,
+				/\b(?:ARCHIVE|FILE_(?:ATTRIBUTE_ARCHIVE|ATTRIBUTE_HIDDEN|ATTRIBUTE_NORMAL|ATTRIBUTE_OFFLINE|ATTRIBUTE_READONLY|ATTRIBUTE_SYSTEM|ATTRIBUTE_TEMPORARY)|HIDDEN|HK(?:CC|(?:CR|CU|LM)(?:32|64)?|DD|PD|U)|HKEY_(?:CLASSES_ROOT|CURRENT_CONFIG|CURRENT_USER|DYN_DATA|LOCAL_MACHINE|PERFORMANCE_DATA|USERS)|ID(?:ABORT|CANCEL|D_(?:DIR|INST(?:FILES)?|LICENSE|SELCOM|UNINST|VERIFY)|IGNORE|NO|OK|RETRY|YES)|MB_(?:ABORTRETRYIGNORE|DEFBUTTON1|DEFBUTTON2|DEFBUTTON3|DEFBUTTON4|ICONEXCLAMATION|ICONINFORMATION|ICONQUESTION|ICONSTOP|OK|OKCANCEL|RETRYCANCEL|RIGHT|RTLREADING|SETFOREGROUND|TOPMOST|USERICON|YESNO(?:CANCEL)?)|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_(?:HIDE|SHOW(?:DEFAULT|MAXIMIZED|MINIMIZED|NORMAL)?)|SYSTEM|TEMPORARY|Win(?:7|8|10|Vista)|admin|all|amd64-unicode|auto|both|bottom|bzip2|colored|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|open|print|right|show|silent|silentlog|smooth|textonly|top|true|try|un\.(?:components|custom|directory|instfiles|license)|uninstConfirm|user|x86-(?:ansi|unicode)|zlib)\b/,
 			'constant': /\$\{[!\w\.:\^-]+\}|\$\([!\w\.:\^-]+\)/,
 			'variable': /\$\w[\w\.]*/,
 			'number': /\b0x[\dA-Fa-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:[Ee]-?\d+)?/,
@@ -31,7 +31,7 @@ export default {
 			'punctuation': /[{}[\];(),.:]/,
 			'important': {
 				pattern:
-					/(^[\t ]*)!(?:addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|verbose|warning)\b/im,
+					/(^[\t ]*)!(?:addincludedir|addplugindir|appendfile|appendmemfile|assert|cd|define|delfile|echo|else|elseif|elseifdef|elseifmacrodef|elseifmacrondef|elseifndef|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|macroundef|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|uninstfinalize|verbose|warning)\b/im,
 				lookbehind: true,
 			},
 		};
diff --git a/tests/languages/nsis/important_feature.test b/tests/languages/nsis/important_feature.test
index 4563c0ff85..ead7870ef2 100644
--- a/tests/languages/nsis/important_feature.test
+++ b/tests/languages/nsis/important_feature.test
@@ -1,75 +1,93 @@
-!addincludedir
-!addplugindir
-!appendfile
-!cd
-!define
-!delfile
-!echo
-!else
-!endif
-!error
-!execute
-!finalize
-!getdllversion
-!gettlbversion
-!ifdef
-!ifmacrodef
-!ifmacrondef
-!ifndef
-!if
-!include
-!insertmacro
-!macroend
-!macro
-!makensis
-!packhdr
-!pragma
-!searchparse
-!searchreplace
-!system
-!tempfile
-!undef
-!verbose
-!warning
-
-----------------------------------------------------
-
-[
-	["important", "!addincludedir"],
-	["important", "!addplugindir"],
-	["important", "!appendfile"],
-	["important", "!cd"],
-	["important", "!define"],
-	["important", "!delfile"],
-	["important", "!echo"],
-	["important", "!else"],
-	["important", "!endif"],
-	["important", "!error"],
-	["important", "!execute"],
-	["important", "!finalize"],
-	["important", "!getdllversion"],
-	["important", "!gettlbversion"],
-	["important", "!ifdef"],
-	["important", "!ifmacrodef"],
-	["important", "!ifmacrondef"],
-	["important", "!ifndef"],
-	["important", "!if"],
-	["important", "!include"],
-	["important", "!insertmacro"],
-	["important", "!macroend"],
-	["important", "!macro"],
-	["important", "!makensis"],
-	["important", "!packhdr"],
-	["important", "!pragma"],
-	["important", "!searchparse"],
-	["important", "!searchreplace"],
-	["important", "!system"],
-	["important", "!tempfile"],
-	["important", "!undef"],
-	["important", "!verbose"],
-	["important", "!warning"]
-]
-
-----------------------------------------------------
-
-Checks for compiler instructions.
\ No newline at end of file
+!addincludedir
+!addplugindir
+!appendfile
+!appendmemfile
+!assert
+!cd
+!define
+!delfile
+!echo
+!else
+!elseif
+!elseifdef
+!elseifmacrodef
+!elseifmacrondef
+!elseifndef
+!endif
+!error
+!execute
+!finalize
+!getdllversion
+!gettlbversion
+!ifdef
+!ifmacrodef
+!ifmacrondef
+!ifndef
+!if
+!include
+!insertmacro
+!macroend
+!macro
+!macroundef
+!makensis
+!packhdr
+!pragma
+!searchparse
+!searchreplace
+!system
+!tempfile
+!undef
+!uninstfinalize
+!verbose
+!warning
+
+----------------------------------------------------
+
+[
+	["important", "!addincludedir"],
+	["important", "!addplugindir"],
+	["important", "!appendfile"],
+	["important", "!appendmemfile"],
+	["important", "!assert"],
+	["important", "!cd"],
+	["important", "!define"],
+	["important", "!delfile"],
+	["important", "!echo"],
+	["important", "!else"],
+	["important", "!elseif"],
+	["important", "!elseifdef"],
+	["important", "!elseifmacrodef"],
+	["important", "!elseifmacrondef"],
+	["important", "!elseifndef"],
+	["important", "!endif"],
+	["important", "!error"],
+	["important", "!execute"],
+	["important", "!finalize"],
+	["important", "!getdllversion"],
+	["important", "!gettlbversion"],
+	["important", "!ifdef"],
+	["important", "!ifmacrodef"],
+	["important", "!ifmacrondef"],
+	["important", "!ifndef"],
+	["important", "!if"],
+	["important", "!include"],
+	["important", "!insertmacro"],
+	["important", "!macroend"],
+	["important", "!macro"],
+	["important", "!macroundef"],
+	["important", "!makensis"],
+	["important", "!packhdr"],
+	["important", "!pragma"],
+	["important", "!searchparse"],
+	["important", "!searchreplace"],
+	["important", "!system"],
+	["important", "!tempfile"],
+	["important", "!undef"],
+	["important", "!uninstfinalize"],
+	["important", "!verbose"],
+	["important", "!warning"]
+]
+
+----------------------------------------------------
+
+Checks for compiler instructions.
diff --git a/tests/languages/nsis/keyword_feature.test b/tests/languages/nsis/keyword_feature.test
index e541cb9ef4..3fa63c0b80 100644
--- a/tests/languages/nsis/keyword_feature.test
+++ b/tests/languages/nsis/keyword_feature.test
@@ -1,465 +1,509 @@
-Abort
-AddBrandingImage
-AddSize
-AdvSplash
-AllowRootDirInstall
-AllowSkipFiles
-AutoCloseWindow
-Banner
-BGFont
-BGGradient
-BGImage
-BrandingText
-BringToFront
-Call
-CallInstDLL
-Caption
-ChangeUI
-CheckBitmap
-ClearErrors
-CompletedText
-ComponentText
-CopyFiles
-CRCCheck
-CreateDirectory
-CreateFont
-CreateShortCut
-Delete
-DeleteINISec
-DeleteINIStr
-DeleteRegKey
-DeleteRegValue
-DetailPrint
-DetailsButtonText
-Dialer
-DirText
-DirVar
-DirVerify
-EnableWindow
-EnumRegKey
-EnumRegValue
-Exch
-Exec
-ExecShell
-ExecWait
-ExecShellWait
-ExpandEnvStrings
-File
-FileBufSize
-FileClose
-FileErrorText
-FileOpen
-FileRead
-FileReadByte
-FileReadUTF16LE
-FileReadWord
-FileSeek
-FileWrite
-FileWriteByte
-FileWriteUTF16LE
-FileWriteWord
-FindClose
-FindFirst
-FindNext
-FindWindow
-FlushINI
-GetCurInstType
-GetCurrentAddress
-GetDlgItem
-GetDLLVersion
-GetDLLVersionLocal
-GetErrorLevel
-GetFileTime
-GetFileTimeLocal
-GetFullPathName
-GetFunction
-GetFunctionAddress
-GetFunctionEnd
-GetInstDirError
-GetKnownFolderPath
-GetLabelAddress
-GetTempFileName
-GetWinVer
-Goto
-HideWindow
-Icon
-IfAbort
-IfErrors
-IfFileExists
-IfRebootFlag
-IfRtlLanguage
-IfShellVarContextAll
-IfSilent
-InitPluginsDir
-InstallButtonText
-InstallColors
-InstallDir
-InstallDirRegKey
-InstProgressFlags
-InstType
-InstTypeGetText
-InstTypeSetText
-Int64Cmp
-Int64CmpU
-Int64Fmt
-IntCmp
-IntCmpU
-IntFmt
-IntOp
-IntPtrCmp
-IntPtrCmpU
-IntPtrOp
-IsWindow
-LangDLL
-LangString
-LicenseBkColor
-LicenseData
-LicenseForceSelection
-LicenseLangString
-LicenseText
-LoadLanguageFile
-LockWindow
-LogSet
-LogText
-ManifestDPIAware
-ManifestSupportedOS
-Math
-MessageBox
-MiscButtonText
-Name
-Nop
-nsDialogs
-nsExec
-NSISdl
-OutFile
-Page
-PageCallbacks
-PEDllCharacteristics
-PESubsysVer
-Pop
-Push
-Quit
-ReadEnvStr
-ReadINIStr
-ReadRegDWORD
-ReadRegStr
-Reboot
-RegDLL
-Rename
-RequestExecutionLevel
-ReserveFile
-Return
-RMDir
-SearchPath
-Section
-SectionEnd
-SectionGetFlags
-SectionGetInstTypes
-SectionGetSize
-SectionGetText
-SectionGroup
-SectionIn
-SectionSetFlags
-SectionSetInstTypes
-SectionSetSize
-SectionSetText
-SendMessage
-SetAutoClose
-SetBrandingImage
-SetCompress
-SetCompressor
-SetCompressorDictSize
-SetCtlColors
-SetCurInstType
-SetDatablockOptimize
-SetDateSave
-SetDetailsPrint
-SetDetailsView
-SetErrorLevel
-SetErrors
-SetFileAttributes
-SetFont
-SetOutPath
-SetOverwrite
-SetPluginUnload
-SetRebootFlag
-SetRegView
-SetShellVarContext
-SetSilent
-ShowInstDetails
-ShowUninstDetails
-ShowWindow
-SilentInstall
-SilentUnInstall
-Sleep
-SpaceTexts
-Splash
-StartMenu
-StrCmp
-StrCmpS
-StrCpy
-StrLen
-SubCaption
-System
-Target
-Unicode
-UninstallButtonText
-UninstallCaption
-UninstallIcon
-UninstallSubCaption
-UninstallText
-UninstPage
-UnRegDLL
-UserInfo
-Var
-VIAddVersionKey
-VIFileVersion
-VIProductVersion
-VPatch
-WindowIcon
-WriteINIStr
-WriteRegBin
-WriteRegDWORD
-WriteRegExpandStr
-WriteRegMultiStr
-WriteRegNone
-WriteRegStr
-WriteUninstaller
-XPStyle
-
-----------------------------------------------------
-
-[
-	["keyword", "Abort"],
-	["keyword", "AddBrandingImage"],
-	["keyword", "AddSize"],
-	["keyword", "AdvSplash"],
-	["keyword", "AllowRootDirInstall"],
-	["keyword", "AllowSkipFiles"],
-	["keyword", "AutoCloseWindow"],
-	["keyword", "Banner"],
-	["keyword", "BGFont"],
-	["keyword", "BGGradient"],
-	["keyword", "BGImage"],
-	["keyword", "BrandingText"],
-	["keyword", "BringToFront"],
-	["keyword", "Call"],
-	["keyword", "CallInstDLL"],
-	["keyword", "Caption"],
-	["keyword", "ChangeUI"],
-	["keyword", "CheckBitmap"],
-	["keyword", "ClearErrors"],
-	["keyword", "CompletedText"],
-	["keyword", "ComponentText"],
-	["keyword", "CopyFiles"],
-	["keyword", "CRCCheck"],
-	["keyword", "CreateDirectory"],
-	["keyword", "CreateFont"],
-	["keyword", "CreateShortCut"],
-	["keyword", "Delete"],
-	["keyword", "DeleteINISec"],
-	["keyword", "DeleteINIStr"],
-	["keyword", "DeleteRegKey"],
-	["keyword", "DeleteRegValue"],
-	["keyword", "DetailPrint"],
-	["keyword", "DetailsButtonText"],
-	["keyword", "Dialer"],
-	["keyword", "DirText"],
-	["keyword", "DirVar"],
-	["keyword", "DirVerify"],
-	["keyword", "EnableWindow"],
-	["keyword", "EnumRegKey"],
-	["keyword", "EnumRegValue"],
-	["keyword", "Exch"],
-	["keyword", "Exec"],
-	["keyword", "ExecShell"],
-	["keyword", "ExecWait"],
-	["keyword", "ExecShellWait"],
-	["keyword", "ExpandEnvStrings"],
-	["keyword", "File"],
-	["keyword", "FileBufSize"],
-	["keyword", "FileClose"],
-	["keyword", "FileErrorText"],
-	["keyword", "FileOpen"],
-	["keyword", "FileRead"],
-	["keyword", "FileReadByte"],
-	["keyword", "FileReadUTF16LE"],
-	["keyword", "FileReadWord"],
-	["keyword", "FileSeek"],
-	["keyword", "FileWrite"],
-	["keyword", "FileWriteByte"],
-	["keyword", "FileWriteUTF16LE"],
-	["keyword", "FileWriteWord"],
-	["keyword", "FindClose"],
-	["keyword", "FindFirst"],
-	["keyword", "FindNext"],
-	["keyword", "FindWindow"],
-	["keyword", "FlushINI"],
-	["keyword", "GetCurInstType"],
-	["keyword", "GetCurrentAddress"],
-	["keyword", "GetDlgItem"],
-	["keyword", "GetDLLVersion"],
-	["keyword", "GetDLLVersionLocal"],
-	["keyword", "GetErrorLevel"],
-	["keyword", "GetFileTime"],
-	["keyword", "GetFileTimeLocal"],
-	["keyword", "GetFullPathName"],
-	["keyword", "GetFunction"],
-	["keyword", "GetFunctionAddress"],
-	["keyword", "GetFunctionEnd"],
-	["keyword", "GetInstDirError"],
-	["keyword", "GetKnownFolderPath"],
-	["keyword", "GetLabelAddress"],
-	["keyword", "GetTempFileName"],
-	["keyword", "GetWinVer"],
-	["keyword", "Goto"],
-	["keyword", "HideWindow"],
-	["keyword", "Icon"],
-	["keyword", "IfAbort"],
-	["keyword", "IfErrors"],
-	["keyword", "IfFileExists"],
-	["keyword", "IfRebootFlag"],
-	["keyword", "IfRtlLanguage"],
-	["keyword", "IfShellVarContextAll"],
-	["keyword", "IfSilent"],
-	["keyword", "InitPluginsDir"],
-	["keyword", "InstallButtonText"],
-	["keyword", "InstallColors"],
-	["keyword", "InstallDir"],
-	["keyword", "InstallDirRegKey"],
-	["keyword", "InstProgressFlags"],
-	["keyword", "InstType"],
-	["keyword", "InstTypeGetText"],
-	["keyword", "InstTypeSetText"],
-	["keyword", "Int64Cmp"],
-	["keyword", "Int64CmpU"],
-	["keyword", "Int64Fmt"],
-	["keyword", "IntCmp"],
-	["keyword", "IntCmpU"],
-	["keyword", "IntFmt"],
-	["keyword", "IntOp"],
-	["keyword", "IntPtrCmp"],
-	["keyword", "IntPtrCmpU"],
-	["keyword", "IntPtrOp"],
-	["keyword", "IsWindow"],
-	["keyword", "LangDLL"],
-	["keyword", "LangString"],
-	["keyword", "LicenseBkColor"],
-	["keyword", "LicenseData"],
-	["keyword", "LicenseForceSelection"],
-	["keyword", "LicenseLangString"],
-	["keyword", "LicenseText"],
-	["keyword", "LoadLanguageFile"],
-	["keyword", "LockWindow"],
-	["keyword", "LogSet"],
-	["keyword", "LogText"],
-	["keyword", "ManifestDPIAware"],
-	["keyword", "ManifestSupportedOS"],
-	["keyword", "Math"],
-	["keyword", "MessageBox"],
-	["keyword", "MiscButtonText"],
-	["keyword", "Name"],
-	["keyword", "Nop"],
-	["keyword", "nsDialogs"],
-	["keyword", "nsExec"],
-	["keyword", "NSISdl"],
-	["keyword", "OutFile"],
-	["keyword", "Page"],
-	["keyword", "PageCallbacks"],
-	["keyword", "PEDllCharacteristics"],
-	["keyword", "PESubsysVer"],
-	["keyword", "Pop"],
-	["keyword", "Push"],
-	["keyword", "Quit"],
-	["keyword", "ReadEnvStr"],
-	["keyword", "ReadINIStr"],
-	["keyword", "ReadRegDWORD"],
-	["keyword", "ReadRegStr"],
-	["keyword", "Reboot"],
-	["keyword", "RegDLL"],
-	["keyword", "Rename"],
-	["keyword", "RequestExecutionLevel"],
-	["keyword", "ReserveFile"],
-	["keyword", "Return"],
-	["keyword", "RMDir"],
-	["keyword", "SearchPath"],
-	["keyword", "Section"],
-	["keyword", "SectionEnd"],
-	["keyword", "SectionGetFlags"],
-	["keyword", "SectionGetInstTypes"],
-	["keyword", "SectionGetSize"],
-	["keyword", "SectionGetText"],
-	["keyword", "SectionGroup"],
-	["keyword", "SectionIn"],
-	["keyword", "SectionSetFlags"],
-	["keyword", "SectionSetInstTypes"],
-	["keyword", "SectionSetSize"],
-	["keyword", "SectionSetText"],
-	["keyword", "SendMessage"],
-	["keyword", "SetAutoClose"],
-	["keyword", "SetBrandingImage"],
-	["keyword", "SetCompress"],
-	["keyword", "SetCompressor"],
-	["keyword", "SetCompressorDictSize"],
-	["keyword", "SetCtlColors"],
-	["keyword", "SetCurInstType"],
-	["keyword", "SetDatablockOptimize"],
-	["keyword", "SetDateSave"],
-	["keyword", "SetDetailsPrint"],
-	["keyword", "SetDetailsView"],
-	["keyword", "SetErrorLevel"],
-	["keyword", "SetErrors"],
-	["keyword", "SetFileAttributes"],
-	["keyword", "SetFont"],
-	["keyword", "SetOutPath"],
-	["keyword", "SetOverwrite"],
-	["keyword", "SetPluginUnload"],
-	["keyword", "SetRebootFlag"],
-	["keyword", "SetRegView"],
-	["keyword", "SetShellVarContext"],
-	["keyword", "SetSilent"],
-	["keyword", "ShowInstDetails"],
-	["keyword", "ShowUninstDetails"],
-	["keyword", "ShowWindow"],
-	["keyword", "SilentInstall"],
-	["keyword", "SilentUnInstall"],
-	["keyword", "Sleep"],
-	["keyword", "SpaceTexts"],
-	["keyword", "Splash"],
-	["keyword", "StartMenu"],
-	["keyword", "StrCmp"],
-	["keyword", "StrCmpS"],
-	["keyword", "StrCpy"],
-	["keyword", "StrLen"],
-	["keyword", "SubCaption"],
-	["keyword", "System"],
-	["keyword", "Target"],
-	["keyword", "Unicode"],
-	["keyword", "UninstallButtonText"],
-	["keyword", "UninstallCaption"],
-	["keyword", "UninstallIcon"],
-	["keyword", "UninstallSubCaption"],
-	["keyword", "UninstallText"],
-	["keyword", "UninstPage"],
-	["keyword", "UnRegDLL"],
-	["keyword", "UserInfo"],
-	["keyword", "Var"],
-	["keyword", "VIAddVersionKey"],
-	["keyword", "VIFileVersion"],
-	["keyword", "VIProductVersion"],
-	["keyword", "VPatch"],
-	["keyword", "WindowIcon"],
-	["keyword", "WriteINIStr"],
-	["keyword", "WriteRegBin"],
-	["keyword", "WriteRegDWORD"],
-	["keyword", "WriteRegExpandStr"],
-	["keyword", "WriteRegMultiStr"],
-	["keyword", "WriteRegNone"],
-	["keyword", "WriteRegStr"],
-	["keyword", "WriteUninstaller"],
-	["keyword", "XPStyle"]
-]
-
-----------------------------------------------------
-
-Checks for all keywords.
+Abort
+AddBrandingImage
+AddSize
+AdvSplash
+AllowRootDirInstall
+AllowSkipFiles
+AutoCloseWindow
+Banner
+BGFont
+BGGradient
+BGImage
+BrandingText
+BringToFront
+Call
+CallInstDLL
+Caption
+ChangeUI
+CheckBitmap
+ClearErrors
+CompletedText
+ComponentText
+CopyFiles
+CPU
+CRCCheck
+CreateDirectory
+CreateFont
+CreateShortCut
+Delete
+DeleteINISec
+DeleteINIStr
+DeleteRegKey
+DeleteRegValue
+DetailPrint
+DetailsButtonText
+Dialer
+DirText
+DirVar
+DirVerify
+EnableWindow
+EnumRegKey
+EnumRegValue
+Exch
+Exec
+ExecShell
+ExecWait
+ExecShellWait
+ExpandEnvStrings
+File
+FileBufSize
+FileClose
+FileErrorText
+FileOpen
+FileRead
+FileReadByte
+FileReadUTF16LE
+FileReadWord
+FileSeek
+FileWrite
+FileWriteByte
+FileWriteUTF16LE
+FileWriteWord
+FindClose
+FindFirst
+FindNext
+FindWindow
+FlushINI
+Function
+FunctionEnd
+GetCurInstType
+GetCurrentAddress
+GetDlgItem
+GetDLLVersion
+GetDLLVersionLocal
+GetErrorLevel
+GetFileTime
+GetFileTimeLocal
+GetFullPathName
+GetFunction
+GetFunctionAddress
+GetFunctionEnd
+GetInstDirError
+GetKnownFolderPath
+GetLabelAddress
+GetRegView
+GetShellVarContext
+GetTempFileName
+GetWinVer
+Goto
+HideWindow
+Icon
+IfAbort
+IfAltRegView
+IfErrors
+IfFileExists
+IfRebootFlag
+IfRtlLanguage
+IfShellVarContextAll
+IfSilent
+InitPluginsDir
+InstallButtonText
+InstallColors
+InstallDir
+InstallDirRegKey
+InstProgressFlags
+InstType
+InstTypeGetText
+InstTypeSetText
+Int64Cmp
+Int64CmpU
+Int64Fmt
+IntCmp
+IntCmpU
+IntFmt
+IntOp
+IntPtrCmp
+IntPtrCmpU
+IntPtrOp
+IsWindow
+LangDLL
+LangString
+LicenseBkColor
+LicenseData
+LicenseForceSelection
+LicenseLangString
+LicenseText
+LoadAndSetImage
+LoadLanguageFile
+LockWindow
+LogSet
+LogText
+ManifestAppendCustomString
+ManifestDisableWindowFiltering
+ManifestDPIAware
+ManifestDPIAwareness
+ManifestGdiScaling
+ManifestLongPathAware
+ManifestMaxVersionTested
+ManifestSupportedOS
+Math
+MessageBox
+MiscButtonText
+Name
+Nop
+nsDialogs
+nsExec
+NSISdl
+OutFile
+Page
+PageCallbacks
+PageEx
+PageExEnd
+PEAddResource
+PEDllCharacteristics
+PERemoveResource
+PESubsysVer
+Pop
+Push
+Quit
+ReadEnvStr
+ReadINIStr
+ReadMemory
+ReadRegDWORD
+ReadRegStr
+Reboot
+RegDLL
+Rename
+RequestExecutionLevel
+ReserveFile
+Return
+RMDir
+SearchPath
+Section
+SectionEnd
+SectionGetFlags
+SectionGetInstTypes
+SectionGetSize
+SectionGetText
+SectionGroup
+SectionGroupEnd
+SectionIn
+SectionInstType
+SectionSetFlags
+SectionSetInstTypes
+SectionSetSize
+SectionSetText
+SendMessage
+SetAutoClose
+SetBrandingImage
+SetCompress
+SetCompressionLevel
+SetCompressor
+SetCompressorDictSize
+SetCtlColors
+SetCurInstType
+SetDatablockOptimize
+SetDateSave
+SetDetailsPrint
+SetDetailsView
+SetErrorLevel
+SetErrors
+SetFileAttributes
+SetFont
+SetOutPath
+SetOverwrite
+SetPluginUnload
+SetRebootFlag
+SetRegView
+SetShellVarContext
+SetSilent
+ShowInstDetails
+ShowUninstDetails
+ShowWindow
+SilentInstall
+SilentUnInstall
+Sleep
+SpaceTexts
+Splash
+StartMenu
+StrCmp
+StrCmpS
+StrCpy
+StrLen
+SubCaption
+System
+Target
+Unicode
+UninstallButtonText
+UninstallCaption
+UninstallIcon
+UninstallSubCaption
+UninstallText
+UninstPage
+UnRegDLL
+UnsafeStrCpy
+UserInfo
+Var
+VIAddVersionKey
+VIFileVersion
+VIProductVersion
+VPatch
+WindowIcon
+WriteINIStr
+WriteRegBin
+WriteRegDWORD
+WriteRegExpandStr
+WriteRegMultiStr
+WriteRegNone
+WriteRegStr
+WriteUninstaller
+XPStyle
+
+----------------------------------------------------
+
+[
+	["keyword", "Abort"],
+	["keyword", "AddBrandingImage"],
+	["keyword", "AddSize"],
+	["keyword", "AdvSplash"],
+	["keyword", "AllowRootDirInstall"],
+	["keyword", "AllowSkipFiles"],
+	["keyword", "AutoCloseWindow"],
+	["keyword", "Banner"],
+	["keyword", "BGFont"],
+	["keyword", "BGGradient"],
+	["keyword", "BGImage"],
+	["keyword", "BrandingText"],
+	["keyword", "BringToFront"],
+	["keyword", "Call"],
+	["keyword", "CallInstDLL"],
+	["keyword", "Caption"],
+	["keyword", "ChangeUI"],
+	["keyword", "CheckBitmap"],
+	["keyword", "ClearErrors"],
+	["keyword", "CompletedText"],
+	["keyword", "ComponentText"],
+	["keyword", "CopyFiles"],
+	["keyword", "CPU"],
+	["keyword", "CRCCheck"],
+	["keyword", "CreateDirectory"],
+	["keyword", "CreateFont"],
+	["keyword", "CreateShortCut"],
+	["keyword", "Delete"],
+	["keyword", "DeleteINISec"],
+	["keyword", "DeleteINIStr"],
+	["keyword", "DeleteRegKey"],
+	["keyword", "DeleteRegValue"],
+	["keyword", "DetailPrint"],
+	["keyword", "DetailsButtonText"],
+	["keyword", "Dialer"],
+	["keyword", "DirText"],
+	["keyword", "DirVar"],
+	["keyword", "DirVerify"],
+	["keyword", "EnableWindow"],
+	["keyword", "EnumRegKey"],
+	["keyword", "EnumRegValue"],
+	["keyword", "Exch"],
+	["keyword", "Exec"],
+	["keyword", "ExecShell"],
+	["keyword", "ExecWait"],
+	["keyword", "ExecShellWait"],
+	["keyword", "ExpandEnvStrings"],
+	["keyword", "File"],
+	["keyword", "FileBufSize"],
+	["keyword", "FileClose"],
+	["keyword", "FileErrorText"],
+	["keyword", "FileOpen"],
+	["keyword", "FileRead"],
+	["keyword", "FileReadByte"],
+	["keyword", "FileReadUTF16LE"],
+	["keyword", "FileReadWord"],
+	["keyword", "FileSeek"],
+	["keyword", "FileWrite"],
+	["keyword", "FileWriteByte"],
+	["keyword", "FileWriteUTF16LE"],
+	["keyword", "FileWriteWord"],
+	["keyword", "FindClose"],
+	["keyword", "FindFirst"],
+	["keyword", "FindNext"],
+	["keyword", "FindWindow"],
+	["keyword", "FlushINI"],
+	["keyword", "Function"],
+	["keyword", "FunctionEnd"],
+	["keyword", "GetCurInstType"],
+	["keyword", "GetCurrentAddress"],
+	["keyword", "GetDlgItem"],
+	["keyword", "GetDLLVersion"],
+	["keyword", "GetDLLVersionLocal"],
+	["keyword", "GetErrorLevel"],
+	["keyword", "GetFileTime"],
+	["keyword", "GetFileTimeLocal"],
+	["keyword", "GetFullPathName"],
+	["keyword", "GetFunction"],
+	["keyword", "GetFunctionAddress"],
+	["keyword", "GetFunctionEnd"],
+	["keyword", "GetInstDirError"],
+	["keyword", "GetKnownFolderPath"],
+	["keyword", "GetLabelAddress"],
+	["keyword", "GetRegView"],
+	["keyword", "GetShellVarContext"],
+	["keyword", "GetTempFileName"],
+	["keyword", "GetWinVer"],
+	["keyword", "Goto"],
+	["keyword", "HideWindow"],
+	["keyword", "Icon"],
+	["keyword", "IfAbort"],
+	["keyword", "IfAltRegView"],
+	["keyword", "IfErrors"],
+	["keyword", "IfFileExists"],
+	["keyword", "IfRebootFlag"],
+	["keyword", "IfRtlLanguage"],
+	["keyword", "IfShellVarContextAll"],
+	["keyword", "IfSilent"],
+	["keyword", "InitPluginsDir"],
+	["keyword", "InstallButtonText"],
+	["keyword", "InstallColors"],
+	["keyword", "InstallDir"],
+	["keyword", "InstallDirRegKey"],
+	["keyword", "InstProgressFlags"],
+	["keyword", "InstType"],
+	["keyword", "InstTypeGetText"],
+	["keyword", "InstTypeSetText"],
+	["keyword", "Int64Cmp"],
+	["keyword", "Int64CmpU"],
+	["keyword", "Int64Fmt"],
+	["keyword", "IntCmp"],
+	["keyword", "IntCmpU"],
+	["keyword", "IntFmt"],
+	["keyword", "IntOp"],
+	["keyword", "IntPtrCmp"],
+	["keyword", "IntPtrCmpU"],
+	["keyword", "IntPtrOp"],
+	["keyword", "IsWindow"],
+	["keyword", "LangDLL"],
+	["keyword", "LangString"],
+	["keyword", "LicenseBkColor"],
+	["keyword", "LicenseData"],
+	["keyword", "LicenseForceSelection"],
+	["keyword", "LicenseLangString"],
+	["keyword", "LicenseText"],
+	["keyword", "LoadAndSetImage"],
+	["keyword", "LoadLanguageFile"],
+	["keyword", "LockWindow"],
+	["keyword", "LogSet"],
+	["keyword", "LogText"],
+	["keyword", "ManifestAppendCustomString"],
+	["keyword", "ManifestDisableWindowFiltering"],
+	["keyword", "ManifestDPIAware"],
+	["keyword", "ManifestDPIAwareness"],
+	["keyword", "ManifestGdiScaling"],
+	["keyword", "ManifestLongPathAware"],
+	["keyword", "ManifestMaxVersionTested"],
+	["keyword", "ManifestSupportedOS"],
+	["keyword", "Math"],
+	["keyword", "MessageBox"],
+	["keyword", "MiscButtonText"],
+	["keyword", "Name"],
+	["keyword", "Nop"],
+	["keyword", "nsDialogs"],
+	["keyword", "nsExec"],
+	["keyword", "NSISdl"],
+	["keyword", "OutFile"],
+	["keyword", "Page"],
+	["keyword", "PageCallbacks"],
+	["keyword", "PageEx"],
+	["keyword", "PageExEnd"],
+	["keyword", "PEAddResource"],
+	["keyword", "PEDllCharacteristics"],
+	["keyword", "PERemoveResource"],
+	["keyword", "PESubsysVer"],
+	["keyword", "Pop"],
+	["keyword", "Push"],
+	["keyword", "Quit"],
+	["keyword", "ReadEnvStr"],
+	["keyword", "ReadINIStr"],
+	["keyword", "ReadMemory"],
+	["keyword", "ReadRegDWORD"],
+	["keyword", "ReadRegStr"],
+	["keyword", "Reboot"],
+	["keyword", "RegDLL"],
+	["keyword", "Rename"],
+	["keyword", "RequestExecutionLevel"],
+	["keyword", "ReserveFile"],
+	["keyword", "Return"],
+	["keyword", "RMDir"],
+	["keyword", "SearchPath"],
+	["keyword", "Section"],
+	["keyword", "SectionEnd"],
+	["keyword", "SectionGetFlags"],
+	["keyword", "SectionGetInstTypes"],
+	["keyword", "SectionGetSize"],
+	["keyword", "SectionGetText"],
+	["keyword", "SectionGroup"],
+	["keyword", "SectionGroupEnd"],
+	["keyword", "SectionIn"],
+	["keyword", "SectionInstType"],
+	["keyword", "SectionSetFlags"],
+	["keyword", "SectionSetInstTypes"],
+	["keyword", "SectionSetSize"],
+	["keyword", "SectionSetText"],
+	["keyword", "SendMessage"],
+	["keyword", "SetAutoClose"],
+	["keyword", "SetBrandingImage"],
+	["keyword", "SetCompress"],
+	["keyword", "SetCompressionLevel"],
+	["keyword", "SetCompressor"],
+	["keyword", "SetCompressorDictSize"],
+	["keyword", "SetCtlColors"],
+	["keyword", "SetCurInstType"],
+	["keyword", "SetDatablockOptimize"],
+	["keyword", "SetDateSave"],
+	["keyword", "SetDetailsPrint"],
+	["keyword", "SetDetailsView"],
+	["keyword", "SetErrorLevel"],
+	["keyword", "SetErrors"],
+	["keyword", "SetFileAttributes"],
+	["keyword", "SetFont"],
+	["keyword", "SetOutPath"],
+	["keyword", "SetOverwrite"],
+	["keyword", "SetPluginUnload"],
+	["keyword", "SetRebootFlag"],
+	["keyword", "SetRegView"],
+	["keyword", "SetShellVarContext"],
+	["keyword", "SetSilent"],
+	["keyword", "ShowInstDetails"],
+	["keyword", "ShowUninstDetails"],
+	["keyword", "ShowWindow"],
+	["keyword", "SilentInstall"],
+	["keyword", "SilentUnInstall"],
+	["keyword", "Sleep"],
+	["keyword", "SpaceTexts"],
+	["keyword", "Splash"],
+	["keyword", "StartMenu"],
+	["keyword", "StrCmp"],
+	["keyword", "StrCmpS"],
+	["keyword", "StrCpy"],
+	["keyword", "StrLen"],
+	["keyword", "SubCaption"],
+	["keyword", "System"],
+	["keyword", "Target"],
+	["keyword", "Unicode"],
+	["keyword", "UninstallButtonText"],
+	["keyword", "UninstallCaption"],
+	["keyword", "UninstallIcon"],
+	["keyword", "UninstallSubCaption"],
+	["keyword", "UninstallText"],
+	["keyword", "UninstPage"],
+	["keyword", "UnRegDLL"],
+	["keyword", "UnsafeStrCpy"],
+	["keyword", "UserInfo"],
+	["keyword", "Var"],
+	["keyword", "VIAddVersionKey"],
+	["keyword", "VIFileVersion"],
+	["keyword", "VIProductVersion"],
+	["keyword", "VPatch"],
+	["keyword", "WindowIcon"],
+	["keyword", "WriteINIStr"],
+	["keyword", "WriteRegBin"],
+	["keyword", "WriteRegDWORD"],
+	["keyword", "WriteRegExpandStr"],
+	["keyword", "WriteRegMultiStr"],
+	["keyword", "WriteRegNone"],
+	["keyword", "WriteRegStr"],
+	["keyword", "WriteUninstaller"],
+	["keyword", "XPStyle"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
diff --git a/tests/languages/nsis/property_feature.test b/tests/languages/nsis/property_feature.test
index 1437e86214..55689eb449 100644
--- a/tests/languages/nsis/property_feature.test
+++ b/tests/languages/nsis/property_feature.test
@@ -1,115 +1,159 @@
-admin all auto both
-colored false force
-hide highest lastused
-leave listonly none
-normal notset off
-on open print show
-silent silentlog
-smooth textonly
-true user
-
-ARCHIVE
-FILE_ATTRIBUTE_ARCHIVE
-FILE_ATTRIBUTE_NORMAL
-FILE_ATTRIBUTE_OFFLINE
-FILE_ATTRIBUTE_READONLY
-FILE_ATTRIBUTE_SYSTEM
-FILE_ATTRIBUTE_TEMPORARY
-HKCR HKCU HKLM
-HKCR32 HKCU32 HKLM32
-HKCR64 HKCU64 HKLM64
-HKDD HKPD HKU
-HKEY_CLASSES_ROOT
-HKEY_CURRENT_CONFIG
-HKEY_CURRENT_USER
-HKEY_DYN_DATA
-HKEY_LOCAL_MACHINE
-HKEY_PERFORMANCE_DATA
-HKEY_USERS
-IDABORT IDCANCEL
-IDIGNORE IDNO
-IDOK IDRETRY IDYES
-MB_ABORTRETRYIGNORE
-MB_DEFBUTTON1
-MB_DEFBUTTON2
-MB_DEFBUTTON3
-MB_DEFBUTTON4
-MB_ICONEXCLAMATION
-MB_ICONINFORMATION
-MB_ICONQUESTION
-MB_ICONSTOP
-MB_OK
-MB_OKCANCEL
-MB_RETRYCANCEL
-MB_RIGHT
-MB_RTLREADING
-MB_SETFOREGROUND
-MB_TOPMOST
-MB_USERICON
-MB_YESNO
-NORMAL OFFLINE
-READONLY SHCTX
-SHELL_CONTEXT
-SYSTEM TEMPORARY
-
-----------------------------------------------------
-
-[
-	["property", "admin"], ["property", "all"], ["property", "auto"], ["property", "both"],
-	["property", "colored"], ["property", "false"], ["property", "force"],
-	["property", "hide"], ["property", "highest"], ["property", "lastused"],
-	["property", "leave"], ["property", "listonly"], ["property", "none"],
-	["property", "normal"], ["property", "notset"], ["property", "off"],
-	["property", "on"], ["property", "open"], ["property", "print"], ["property", "show"],
-	["property", "silent"], ["property", "silentlog"],
-	["property", "smooth"], ["property", "textonly"],
-	["property", "true"], ["property", "user"],
-	
-	["property", "ARCHIVE"],
-	["property", "FILE_ATTRIBUTE_ARCHIVE"],
-	["property", "FILE_ATTRIBUTE_NORMAL"],
-	["property", "FILE_ATTRIBUTE_OFFLINE"],
-	["property", "FILE_ATTRIBUTE_READONLY"],
-	["property", "FILE_ATTRIBUTE_SYSTEM"],
-	["property", "FILE_ATTRIBUTE_TEMPORARY"],
-	["property", "HKCR"], ["property", "HKCU"], ["property", "HKLM"],
-	["property", "HKCR32"], ["property", "HKCU32"], ["property", "HKLM32"],
-	["property", "HKCR64"], ["property", "HKCU64"], ["property", "HKLM64"],
-	["property", "HKDD"], ["property", "HKPD"], ["property", "HKU"],
-	["property", "HKEY_CLASSES_ROOT"],
-	["property", "HKEY_CURRENT_CONFIG"],
-	["property", "HKEY_CURRENT_USER"],
-	["property", "HKEY_DYN_DATA"],
-	["property", "HKEY_LOCAL_MACHINE"],
-	["property", "HKEY_PERFORMANCE_DATA"],
-	["property", "HKEY_USERS"],
-	["property", "IDABORT"], ["property", "IDCANCEL"],
-	["property", "IDIGNORE"], ["property", "IDNO"],
-	["property", "IDOK"], ["property", "IDRETRY"], ["property", "IDYES"],
-	["property", "MB_ABORTRETRYIGNORE"],
-	["property", "MB_DEFBUTTON1"],
-	["property", "MB_DEFBUTTON2"],
-	["property", "MB_DEFBUTTON3"],
-	["property", "MB_DEFBUTTON4"],
-	["property", "MB_ICONEXCLAMATION"],
-	["property", "MB_ICONINFORMATION"],
-	["property", "MB_ICONQUESTION"],
-	["property", "MB_ICONSTOP"],
-	["property", "MB_OK"],
-	["property", "MB_OKCANCEL"],
-	["property", "MB_RETRYCANCEL"],
-	["property", "MB_RIGHT"],
-	["property", "MB_RTLREADING"],
-	["property", "MB_SETFOREGROUND"],
-	["property", "MB_TOPMOST"],
-	["property", "MB_USERICON"],
-	["property", "MB_YESNO"],
-	["property", "NORMAL"], ["property", "OFFLINE"],
-	["property", "READONLY"], ["property", "SHCTX"],
-	["property", "SHELL_CONTEXT"],
-	["property", "SYSTEM"], ["property", "TEMPORARY"]
-]
-
-----------------------------------------------------
-
-Checks for all properties.
\ No newline at end of file
+admin all auto both
+colored false force
+hide highest lastused
+leave listonly none
+normal notset off
+on open print show
+silent silentlog
+smooth textonly
+true user
+amd64-unicode bottom bzip2
+components current custom
+directory ifdiff ifnewer
+instfiles left license
+lzma nevershow right
+top try un.components
+un.custom un.directory un.instfiles
+un.license uninstConfirm x86-ansi
+x86-unicode zlib
+
+ARCHIVE
+FILE_ATTRIBUTE_ARCHIVE
+FILE_ATTRIBUTE_NORMAL
+FILE_ATTRIBUTE_OFFLINE
+FILE_ATTRIBUTE_READONLY
+FILE_ATTRIBUTE_SYSTEM
+FILE_ATTRIBUTE_TEMPORARY
+HKCR HKCU HKLM
+HKCR32 HKCU32 HKLM32
+HKCR64 HKCU64 HKLM64
+HKDD HKPD HKU
+HKEY_CLASSES_ROOT
+HKEY_CURRENT_CONFIG
+HKEY_CURRENT_USER
+HKEY_DYN_DATA
+HKEY_LOCAL_MACHINE
+HKEY_PERFORMANCE_DATA
+HKEY_USERS
+IDABORT IDCANCEL
+IDIGNORE IDNO
+IDOK IDRETRY IDYES
+MB_ABORTRETRYIGNORE
+MB_DEFBUTTON1
+MB_DEFBUTTON2
+MB_DEFBUTTON3
+MB_DEFBUTTON4
+MB_ICONEXCLAMATION
+MB_ICONINFORMATION
+MB_ICONQUESTION
+MB_ICONSTOP
+MB_OK
+MB_OKCANCEL
+MB_RETRYCANCEL
+MB_RIGHT
+MB_RTLREADING
+MB_SETFOREGROUND
+MB_TOPMOST
+MB_USERICON
+MB_YESNO
+NORMAL OFFLINE
+READONLY SHCTX
+SHELL_CONTEXT
+SYSTEM TEMPORARY
+FILE_ATTRIBUTE_HIDDEN HIDDEN
+HKCC IDD_DIR
+IDD_INST IDD_INSTFILES
+IDD_LICENSE IDD_SELCOM
+IDD_UNINST IDD_VERIFY
+MB_YESNOCANCEL SW_HIDE
+SW_SHOW SW_SHOWDEFAULT
+SW_SHOWMAXIMIZED SW_SHOWMINIMIZED
+SW_SHOWNORMAL Win7
+Win8 Win10
+WinVista
+
+----------------------------------------------------
+
+[
+	["property", "admin"], ["property", "all"], ["property", "auto"], ["property", "both"],
+	["property", "colored"], ["property", "false"], ["property", "force"],
+	["property", "hide"], ["property", "highest"], ["property", "lastused"],
+	["property", "leave"], ["property", "listonly"], ["property", "none"],
+	["property", "normal"], ["property", "notset"], ["property", "off"],
+	["property", "on"], ["property", "open"], ["property", "print"], ["property", "show"],
+	["property", "silent"], ["property", "silentlog"],
+	["property", "smooth"], ["property", "textonly"],
+	["property", "true"], ["property", "user"],
+	["property", "amd64-unicode"], ["property", "bottom"],
+	["property", "bzip2"], ["property", "components"],
+	["property", "current"], ["property", "custom"],
+	["property", "directory"], ["property", "ifdiff"],
+	["property", "ifnewer"], ["property", "instfiles"],
+	["property", "left"], ["property", "license"],
+	["property", "lzma"], ["property", "nevershow"],
+	["property", "right"], ["property", "top"],
+	["property", "try"], ["property", "un.components"],
+	["property", "un.custom"], ["property", "un.directory"],
+	["property", "un.instfiles"], ["property", "un.license"],
+	["property", "uninstConfirm"], ["property", "x86-ansi"],
+	["property", "x86-unicode"], ["property", "zlib"],
+	
+	["property", "ARCHIVE"],
+	["property", "FILE_ATTRIBUTE_ARCHIVE"],
+	["property", "FILE_ATTRIBUTE_NORMAL"],
+	["property", "FILE_ATTRIBUTE_OFFLINE"],
+	["property", "FILE_ATTRIBUTE_READONLY"],
+	["property", "FILE_ATTRIBUTE_SYSTEM"],
+	["property", "FILE_ATTRIBUTE_TEMPORARY"],
+	["property", "HKCR"], ["property", "HKCU"], ["property", "HKLM"],
+	["property", "HKCR32"], ["property", "HKCU32"], ["property", "HKLM32"],
+	["property", "HKCR64"], ["property", "HKCU64"], ["property", "HKLM64"],
+	["property", "HKDD"], ["property", "HKPD"], ["property", "HKU"],
+	["property", "HKEY_CLASSES_ROOT"],
+	["property", "HKEY_CURRENT_CONFIG"],
+	["property", "HKEY_CURRENT_USER"],
+	["property", "HKEY_DYN_DATA"],
+	["property", "HKEY_LOCAL_MACHINE"],
+	["property", "HKEY_PERFORMANCE_DATA"],
+	["property", "HKEY_USERS"],
+	["property", "IDABORT"], ["property", "IDCANCEL"],
+	["property", "IDIGNORE"], ["property", "IDNO"],
+	["property", "IDOK"], ["property", "IDRETRY"], ["property", "IDYES"],
+	["property", "MB_ABORTRETRYIGNORE"],
+	["property", "MB_DEFBUTTON1"],
+	["property", "MB_DEFBUTTON2"],
+	["property", "MB_DEFBUTTON3"],
+	["property", "MB_DEFBUTTON4"],
+	["property", "MB_ICONEXCLAMATION"],
+	["property", "MB_ICONINFORMATION"],
+	["property", "MB_ICONQUESTION"],
+	["property", "MB_ICONSTOP"],
+	["property", "MB_OK"],
+	["property", "MB_OKCANCEL"],
+	["property", "MB_RETRYCANCEL"],
+	["property", "MB_RIGHT"],
+	["property", "MB_RTLREADING"],
+	["property", "MB_SETFOREGROUND"],
+	["property", "MB_TOPMOST"],
+	["property", "MB_USERICON"],
+	["property", "MB_YESNO"],
+	["property", "NORMAL"], ["property", "OFFLINE"],
+	["property", "READONLY"], ["property", "SHCTX"],
+	["property", "SHELL_CONTEXT"],
+	["property", "SYSTEM"], ["property", "TEMPORARY"],
+	["property", "FILE_ATTRIBUTE_HIDDEN"], ["property", "HIDDEN"],
+	["property", "HKCC"], ["property", "IDD_DIR"],
+	["property", "IDD_INST"], ["property", "IDD_INSTFILES"],
+	["property", "IDD_LICENSE"], ["property", "IDD_SELCOM"],
+	["property", "IDD_UNINST"], ["property", "IDD_VERIFY"],
+	["property", "MB_YESNOCANCEL"], ["property", "SW_HIDE"],
+	["property", "SW_SHOW"], ["property", "SW_SHOWDEFAULT"],
+	["property", "SW_SHOWMAXIMIZED"], ["property", "SW_SHOWMINIMIZED"],
+	["property", "SW_SHOWNORMAL"], ["property", "Win7"],
+	["property", "Win8"], ["property", "Win10"],
+	["property", "WinVista"]
+]
+
+----------------------------------------------------
+
+Checks for all properties.