diff --git a/indent/vue.vim b/indent/vue.vim
index 53b9851..65fa50a 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -90,13 +90,14 @@ setlocal indentexpr=GetVueIndent()
 "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 function! GetVueIndent()
-  let curline = getline(v:lnum)
   let prevline = getline(v:lnum - 1)
-  let cursyns = s:SynsEOL(v:lnum)
   let prevsyns = s:SynsEOL(v:lnum - 1)
-  let cursyn = get(cursyns, 0)
   let prevsyn = get(prevsyns, 0)
 
+  let curline = getline(v:lnum)
+  let cursyns = s:SynsEOL(v:lnum)
+  let cursyn = get(cursyns, 0)
+
   if s:SynPug(prevsyn)
     call LogMsg('syntax: pug')
     let ind = GetPugIndent()
diff --git a/syntax/vue-html.vim b/syntax/vue-html.vim
index 6f684b7..8617610 100644
--- a/syntax/vue-html.vim
+++ b/syntax/vue-html.vim
@@ -1,10 +1,12 @@
 syntax match VueComponentName containedin=htmlTagN '\v<[a-zA-Z0-9]+(-[a-zA-Z0-9]+)+>'
-syntax match VueAttr '\v(\S)@<![v:\@][^\=]+(\=\"[^"]*\")?' 
+syntax match VueAttr '\v(\S)@<![v:\@][^\=]*(\=\"[^"]*\")?' 
       \ containedin=htmlTag 
-      \ contains=VueKey,VueValue,VueInject
+      \ contains=VueKey,VueValue
+
+syntax match VueKey contained '\v[v:\@][^\=]+' keepend
+syntax match VueValue contained '\v\"\zs[^"]*\ze\"'
+      \ contains=VueInject,javaScriptStringS,javaScriptRepeat
 
-syntax match VueKey contained '\v[v:\@][^\=]+'
-syntax match VueValue contains=VueInject contained '\v\"\zs[^"]*\ze\"'
 syntax match VueInject contained '\v\$\w*'
 
 syntax region VueExpression 
@@ -15,7 +17,8 @@ syntax region VueExpression
       \ end="}}"
 
 syntax region VueExpression 
-      \ containedin=vueTemplate,vueValue,htmlString
+      \ containedin=vueTemplate,VueValue,htmlString,htmlValue
+      \ contains=@jsAll
       \ matchgroup=VueBrace
       \ start="{{"
       \ end="}}"
@@ -28,7 +31,7 @@ syntax match VueAttr '\v(\S)@<!wx[^\=]+(\=\"[^"]*\")?'
 syntax match VueKey contained '\vwx[^\=]+'
 
 highlight link VueAttr Comment
-highlight link VueKey  PreProc
+highlight link VueKey  Type
 highlight link VueInject Constant
-highlight link VueBrace PreProc
+highlight link VueBrace Type
 highlight link VueComponentName Statement
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 7e4fe84..117c8eb 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -60,6 +60,8 @@ endfunction
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Load syntax/*.vim to syntax group
 call s:LoadSyntax('@HTMLSyntax', 'html')
+
+" Load vue-html syntax
 runtime syntax/vue-html.vim
 
 " Avoid overload