diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 31c7b05..18da779 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,13 +2,13 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Aug 26, 2016
+" Last Change:		Aug 31, 2016
 " Version:		162
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
 
-" quit when a syntax file was already loaded
+" quit when a syntax file was already loaded {{{1
 if exists("b:current_syntax")
   finish
 endif
@@ -145,7 +145,7 @@
 syn cluster shHereList	contains=shBeginHere,shHerePayload
 syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
 syn cluster shIdList	contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shHereString,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
-syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo,shParen
+syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
 syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr,shTouch
 syn cluster shPPSRightList	contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
 syn cluster shSubShList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
@@ -497,7 +497,7 @@
 if exists("b:is_bash")
  " bash : ${parameter:offset}
  " bash : ${parameter:offset:length}
- syn region shDerefOff	contained	start=':\ze[^-=?+]'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
+ syn region shDerefOff	contained	start=':'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn region shDerefOff	contained	start=':\s-'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn match  shDerefLen	contained	":[^}]\+"	contains=shDeref,shDerefSimple
 
@@ -573,132 +573,134 @@
 
 " Default Highlighting: {{{1
 " =====================
-hi def link shArithRegion	shShellVariables
-hi def link shAstQuote	shDoubleQuote
-hi def link shAtExpr	shSetList
-hi def link shBeginHere	shRedir
-hi def link shCaseBar	shConditional
-hi def link shCaseCommandSub	shCommandSub
-hi def link shCaseDoubleQuote	shDoubleQuote
-hi def link shCaseIn	shConditional
-hi def link shQuote	shOperator
-hi def link shCaseSingleQuote	shSingleQuote
-hi def link shCaseStart	shConditional
-hi def link shCmdSubRegion	shShellVariables
-hi def link shColon	shComment
-hi def link shDerefOp	shOperator
-hi def link shDerefPOL	shDerefOp
-hi def link shDerefPPS	shDerefOp
-hi def link shDerefPSR	shDerefOp
-hi def link shDeref	shShellVariables
-hi def link shDerefDelim	shOperator
-hi def link shDerefSimple	shDeref
-hi def link shDerefSpecial	shDeref
-hi def link shDerefString	shDoubleQuote
-hi def link shDerefVar	shDeref
-hi def link shDoubleQuote	shString
-hi def link shEcho	shString
-hi def link shEchoDelim	shOperator
-hi def link shEchoQuote	shString
-hi def link shForPP	shLoop
-hi def link shFunction	Function
-hi def link shEmbeddedEcho	shString
-hi def link shEscape	shCommandSub
-hi def link shExDoubleQuote	shDoubleQuote
-hi def link shExSingleQuote	shSingleQuote
-hi def link shHereDoc	shString
-hi def link shHereString	shRedir
-hi def link shHerePayload	shHereDoc
-hi def link shLoop	shStatement
-hi def link shSpecialNxt	shSpecial
-hi def link shNoQuote	shDoubleQuote
-hi def link shOption	shCommandSub
-hi def link shPattern	shString
-hi def link shParen	shArithmetic
-hi def link shPosnParm	shShellVariables
-hi def link shQuickComment	shComment
-hi def link shRange	shOperator
-hi def link shRedir	shOperator
-hi def link shSetListDelim	shOperator
-hi def link shSetOption	shOption
-hi def link shSingleQuote	shString
-hi def link shSource	shOperator
-hi def link shStringSpecial	shSpecial
-hi def link shSubShRegion	shOperator
-hi def link shTestOpr	shConditional
-hi def link shTestPattern	shString
-hi def link shTestDoubleQuote	shString
-hi def link shTestSingleQuote	shString
-hi def link shTouchCmd	shStatement
-hi def link shVariable	shSetList
-hi def link shWrapLineOperator	shOperator
+if !exists("skip_sh_syntax_inits")
+ hi def link shArithRegion	shShellVariables
+ hi def link shAstQuote	shDoubleQuote
+ hi def link shAtExpr	shSetList
+ hi def link shBeginHere	shRedir
+ hi def link shCaseBar	shConditional
+ hi def link shCaseCommandSub	shCommandSub
+ hi def link shCaseDoubleQuote	shDoubleQuote
+ hi def link shCaseIn	shConditional
+ hi def link shQuote	shOperator
+ hi def link shCaseSingleQuote	shSingleQuote
+ hi def link shCaseStart	shConditional
+ hi def link shCmdSubRegion	shShellVariables
+ hi def link shColon	shComment
+ hi def link shDerefOp	shOperator
+ hi def link shDerefPOL	shDerefOp
+ hi def link shDerefPPS	shDerefOp
+ hi def link shDerefPSR	shDerefOp
+ hi def link shDeref	shShellVariables
+ hi def link shDerefDelim	shOperator
+ hi def link shDerefSimple	shDeref
+ hi def link shDerefSpecial	shDeref
+ hi def link shDerefString	shDoubleQuote
+ hi def link shDerefVar	shDeref
+ hi def link shDoubleQuote	shString
+ hi def link shEcho	shString
+ hi def link shEchoDelim	shOperator
+ hi def link shEchoQuote	shString
+ hi def link shForPP	shLoop
+ hi def link shFunction	Function
+ hi def link shEmbeddedEcho	shString
+ hi def link shEscape	shCommandSub
+ hi def link shExDoubleQuote	shDoubleQuote
+ hi def link shExSingleQuote	shSingleQuote
+ hi def link shHereDoc	shString
+ hi def link shHereString	shRedir
+ hi def link shHerePayload	shHereDoc
+ hi def link shLoop	shStatement
+ hi def link shSpecialNxt	shSpecial
+ hi def link shNoQuote	shDoubleQuote
+ hi def link shOption	shCommandSub
+ hi def link shPattern	shString
+ hi def link shParen	shArithmetic
+ hi def link shPosnParm	shShellVariables
+ hi def link shQuickComment	shComment
+ hi def link shRange	shOperator
+ hi def link shRedir	shOperator
+ hi def link shSetListDelim	shOperator
+ hi def link shSetOption	shOption
+ hi def link shSingleQuote	shString
+ hi def link shSource	shOperator
+ hi def link shStringSpecial	shSpecial
+ hi def link shSubShRegion	shOperator
+ hi def link shTestOpr	shConditional
+ hi def link shTestPattern	shString
+ hi def link shTestDoubleQuote	shString
+ hi def link shTestSingleQuote	shString
+ hi def link shTouchCmd	shStatement
+ hi def link shVariable	shSetList
+ hi def link shWrapLineOperator	shOperator
 
-if exists("b:is_bash")
-  hi def link bashAdminStatement	shStatement
-  hi def link bashSpecialVariables	shShellVariables
-  hi def link bashStatement		shStatement
-  hi def link shCharClass		shSpecial
-  hi def link shDerefOff		shDerefOp
-  hi def link shDerefLen		shDerefOff
-endif
-if exists("b:is_kornshell")
-  hi def link kshSpecialVariables	shShellVariables
-  hi def link kshStatement		shStatement
-endif
-
-if !exists("g:sh_no_error")
- hi def link shCaseError		Error
- hi def link shCondError		Error
- hi def link shCurlyError		Error
- hi def link shDerefOpError		Error
- hi def link shDerefWordError		Error
- hi def link shDoError		Error
- hi def link shEsacError		Error
- hi def link shIfError		Error
- hi def link shInError		Error
- hi def link shParenError		Error
- hi def link shTestError		Error
- if exists("b:is_kornshell")
-   hi def link shDTestError		Error
+ if exists("b:is_bash")
+   hi def link bashAdminStatement	shStatement
+   hi def link bashSpecialVariables	shShellVariables
+   hi def link bashStatement		shStatement
+   hi def link shCharClass		shSpecial
+   hi def link shDerefOff		shDerefOp
+   hi def link shDerefLen		shDerefOff
  endif
-endif
+ if exists("b:is_kornshell")
+   hi def link kshSpecialVariables	shShellVariables
+   hi def link kshStatement		shStatement
+ endif
 
-hi def link shArithmetic		Special
-hi def link shCharClass		Identifier
-hi def link shSnglCase		Statement
-hi def link shCommandSub		Special
-hi def link shComment		Comment
-hi def link shConditional		Conditional
-hi def link shCtrlSeq		Special
-hi def link shExprRegion		Delimiter
-hi def link shFunctionKey		Function
-hi def link shFunctionName		Function
-hi def link shNumber		Number
-hi def link shOperator		Operator
-hi def link shRepeat		Repeat
-hi def link shSet		Statement
-hi def link shSetList		Identifier
-hi def link shShellVariables		PreProc
-hi def link shSpecial		Special
-hi def link shStatement		Statement
-hi def link shString		String
-hi def link shTodo		Todo
-hi def link shAlias		Identifier
-hi def link shHereDoc01		shRedir
-hi def link shHereDoc02		shRedir
-hi def link shHereDoc03		shRedir
-hi def link shHereDoc04		shRedir
-hi def link shHereDoc05		shRedir
-hi def link shHereDoc06		shRedir
-hi def link shHereDoc07		shRedir
-hi def link shHereDoc08		shRedir
-hi def link shHereDoc09		shRedir
-hi def link shHereDoc10		shRedir
-hi def link shHereDoc11		shRedir
-hi def link shHereDoc12		shRedir
-hi def link shHereDoc13		shRedir
-hi def link shHereDoc14		shRedir
-hi def link shHereDoc15		shRedir
+ if !exists("g:sh_no_error")
+  hi def link shCaseError		Error
+  hi def link shCondError		Error
+  hi def link shCurlyError		Error
+  hi def link shDerefOpError		Error
+  hi def link shDerefWordError		Error
+  hi def link shDoError		Error
+  hi def link shEsacError		Error
+  hi def link shIfError		Error
+  hi def link shInError		Error
+  hi def link shParenError		Error
+  hi def link shTestError		Error
+  if exists("b:is_kornshell")
+    hi def link shDTestError		Error
+  endif
+ endif
+
+ hi def link shArithmetic		Special
+ hi def link shCharClass		Identifier
+ hi def link shSnglCase		Statement
+ hi def link shCommandSub		Special
+ hi def link shComment		Comment
+ hi def link shConditional		Conditional
+ hi def link shCtrlSeq		Special
+ hi def link shExprRegion		Delimiter
+ hi def link shFunctionKey		Function
+ hi def link shFunctionName		Function
+ hi def link shNumber		Number
+ hi def link shOperator		Operator
+ hi def link shRepeat		Repeat
+ hi def link shSet		Statement
+ hi def link shSetList		Identifier
+ hi def link shShellVariables		PreProc
+ hi def link shSpecial		Special
+ hi def link shStatement		Statement
+ hi def link shString		String
+ hi def link shTodo		Todo
+ hi def link shAlias		Identifier
+ hi def link shHereDoc01		shRedir
+ hi def link shHereDoc02		shRedir
+ hi def link shHereDoc03		shRedir
+ hi def link shHereDoc04		shRedir
+ hi def link shHereDoc05		shRedir
+ hi def link shHereDoc06		shRedir
+ hi def link shHereDoc07		shRedir
+ hi def link shHereDoc08		shRedir
+ hi def link shHereDoc09		shRedir
+ hi def link shHereDoc10		shRedir
+ hi def link shHereDoc11		shRedir
+ hi def link shHereDoc12		shRedir
+ hi def link shHereDoc13		shRedir
+ hi def link shHereDoc14		shRedir
+ hi def link shHereDoc15		shRedir
+endif
 
 " Delete shell folding commands {{{1
 " =============================