diff --git a/tools/vim/lammps.vim b/tools/vim/lammps.vim
index 236dd54a1b29e812c25095a00ab73a60d39ae7c3..be26f3081e78bffb53e1afe9d82da77f3d686c9c 100644
--- a/tools/vim/lammps.vim
+++ b/tools/vim/lammps.vim
@@ -1,63 +1,63 @@
 " Vim syntax file
 " Language:	         Lammps Simulation Script File
 " Maintainer:        Gerolf Ziegenhain <gerolf@ziegenhain.com>
-" Updates:           Axel Kohlmeyer <akohlmey@gmail.com>, Sam Bateman <sam.bateman@nrlssc.navy.mil>
-" Latest Revision:   2010-11-25
+" Updates:           Axel Kohlmeyer <akohlmey@gmail.com>, Sam Bateman <sam.bateman@nrlssc.navy.mil>, Daniel Möller Montull <d.moller.m@gmail.com>
+" Latest Revision:   2012-06-19
 
 syn clear
 
-syn keyword lammpsOutput      log write_restart dump undump thermo thermo_modify thermo_style print 
-syn keyword lammpsRead        include read read_restart read_data
-syn keyword lammpsLattice     boundary units atom_style lattice region create_box create_atoms dielectric
-syn keyword lammpsLattice     delete_atoms change_box dimension replicate
-syn keyword lammpsParticle    pair_coeff pair_style pair_modify mass velocity angle_coeff angle_style
-syn keyword lammpsParticle    atom_modify atom_style bond_coeff bond_style delete_bonds kspace_style
-syn keyword lammpsParticle    kspace_modify dihedral_style dihedral_coeff improper_style improper_coeff
-syn keyword lammpsSetup       min_style fix_modify run_style timestep neighbor neigh_modify fix unfix
-syn keyword lammpsSetup       communicate newton nthreads processors reset_timestep
-syn keyword lammpsRun         minimize run  
-syn keyword lammpsDefine      variable group
+syn keyword	lammpsOutput	log write_restart restart dump undump thermo thermo_modify thermo_style print 
+syn keyword	lammpsRead	include read read_restart read_data
+syn keyword	lammpsLattice	boundary units atom_style lattice region create_box create_atoms dielectric
+syn keyword	lammpsLattice	delete_atoms change_box dimension replicate
+syn keyword	lammpsParticle	pair_coeff pair_style pair_modify mass velocity angle_coeff angle_style
+syn keyword	lammpsParticle	atom_modify atom_style bond_coeff bond_style delete_bonds kspace_style
+syn keyword	lammpsParticle	kspace_modify dihedral_style dihedral_coeff improper_style improper_coeff
+syn keyword	lammpsSetup	min_style fix_modify run_style timestep neighbor neigh_modify fix unfix
+syn keyword	lammpsSetup	communicate newton nthreads processors reset_timestep
+syn keyword	lammpsRun	minimize run  
+syn keyword	lammpsDefine	variable group compute
 
-syn keyword lammpsRepeat      jump next loop
+syn keyword	lammpsRepeat	jump next loop
 
-syn keyword lammpsOperator    equal add sub mult div 
+syn keyword	lammpsOperator	equal add sub mult div 
 
-syn keyword lammpsConditional if then elif else
+syn keyword	lammpsConditional if then elif else
 
-syn keyword lammpsSpecial     EDGE NULL
+syn keyword	lammpsSpecial	EDGE NULL &
 
-syn region lammpsString			start=+'+ end=+'+	oneline
-syn region lammpsString			start=+"+ end=+"+	oneline
+syn region	lammpsString	start=+'+ end=+'+	oneline
+syn region	lammpsString	start=+"+ end=+"+	oneline
 
-syn match lammpsNumber		"\<[0-9]\+[ij]\=\>"
-syn match lammpsFloat		"\<[0-9]\+\.[0-9]*\([edED][-+]\=[0-9]\+\)\=[ij]\=\>"
-syn match lammpsFloat		"\.[0-9]\+\([edED][-+]\=[0-9]\+\)\=[ij]\=\>"
-syn match lammpsFloat		"\<[0-9]\+[edED][-+]\=[0-9]\+[ij]\=\>"
+syn match	lammpsNumber	"\<[0-9]\+[ij]\=\>"
+syn match	lammpsFloat	"\<[0-9]\+\.[0-9]*\([edED][-+]\=[0-9]\+\)\=[ij]\=\>"
+syn match	lammpsFloat	"\.[0-9]\+\([edED][-+]\=[0-9]\+\)\=[ij]\=\>"
+syn match	lammpsFloat	"\<[0-9]\+[edED][-+]\=[0-9]\+[ij]\=\>"
 
-syn match lammpsComment         "#.*$"
+syn match	lammpsComment	"#\(.*&\s*\n\)*.*$"
 
-syn match lammpsVariable   "\$\({[a-zA-Z0-9_]\+}\)"
-syn match lammpsVariable   "\$[A-Za-z]"
+syn match	lammpsVariable	"\$\({[a-zA-Z0-9_]\+}\)"
+syn match	lammpsVariable	"\$[A-Za-z]"
 
 if !exists("did_lammps_syntax_inits")
   let did_lammps_syntax_inits = 1
-  hi link lammpsOutput        Function
-  hi link lammpsRepeat        Repeat
-  hi link lammpsRead          Include
-  hi link lammpsLattice   		Typedef
-  hi link lammpsParticle      Typedef
-  hi link lammpsSetup         Typedef
-  hi link lammpsDefine        Define
-  hi link lammpsRun           Statement
-  hi link lammpsNumber			Number
-  hi link lammpsFloat			Float
-  hi link lammpsString			String
-  hi link lammpsComment			Comment
-  hi link lammpsLoop          Repeat
-  hi link lammpsVariable      Identifier
-  hi link lammpsConditional   Conditional
-  hi link lammpsOperator      Operator
-  hi link lammpsSpecial       Number
+  hi link lammpsOutput		Function
+  hi link lammpsRepeat		Repeat
+  hi link lammpsRead		Include
+  hi link lammpsLattice		Typedef
+  hi link lammpsParticle	Typedef
+  hi link lammpsSetup		Typedef
+  hi link lammpsDefine		Define
+  hi link lammpsRun		Statement
+  hi link lammpsNumber		Number
+  hi link lammpsFloat		Float
+  hi link lammpsString		String
+  hi link lammpsComment		Comment
+  hi link lammpsLoop		Repeat
+  hi link lammpsVariable	Identifier
+  hi link lammpsConditional	Conditional
+  hi link lammpsOperator	Operator
+  hi link lammpsSpecial		Number
 endif
 
 let b:current_syntax = "lammps"