diff --git a/runtime/syntax/asm.vim b/runtime/syntax/asm.vim
index 09bfe4f..40756de 100644
--- a/runtime/syntax/asm.vim
+++ b/runtime/syntax/asm.vim
@@ -1,10 +1,12 @@
 " Vim syntax file
 " Language:	GNU Assembler
-" Maintainer:	Kevin Dahlhausen <kdahlhaus@yahoo.com>
-" Last Change:	2002 Sep 19
+" Maintainer:	Erik Wognsen <erik.wognsen@gmail.com>
+"		Previous maintainer:
+"		Kevin Dahlhausen <kdahlhaus@yahoo.com>
+" Last Change:	2010 Jan 9
 
 " For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
+" For version 6.0 and later: Quit when a syntax file was already loaded
 if version < 600
   syntax clear
 elseif exists("b:current_syntax")
@@ -13,7 +15,6 @@
 
 syn case ignore
 
-
 " storage types
 syn match asmType "\.long"
 syn match asmType "\.ascii"
@@ -44,9 +45,8 @@
 syn match hexNumber		"0[xX][0-9a-fA-F]\+"
 syn match binNumber		"0[bB][0-1]*"
 
-
-syn match asmSpecialComment	";\*\*\*.*"
-syn match asmComment		";.*"hs=s+1
+syn match asmComment		"#.*"
+syn region asmComment		start="/\*" end="\*/"
 
 syn match asmInclude		"\.include"
 syn match asmCond		"\.if"
@@ -86,15 +86,9 @@
   HiLink octNumber	Number
   HiLink binNumber	Number
 
-  HiLink asmSpecialComment Comment
   HiLink asmIdentifier Identifier
   HiLink asmType	Type
 
-  " My default color overrides:
-  " hi asmSpecialComment ctermfg=red
-  " hi asmIdentifier ctermfg=lightcyan
-  " hi asmType ctermbg=black ctermfg=brown
-
   delcommand HiLink
 endif
 
diff --git a/runtime/syntax/screen.vim b/runtime/syntax/screen.vim
index e1ff4ec..71b3d3e 100644
--- a/runtime/syntax/screen.vim
+++ b/runtime/syntax/screen.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         screen(1) configuration file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-04-19
+" Latest Revision:  2010-01-03
 
 if exists("b:current_syntax")
   finish
@@ -15,54 +15,219 @@
 syn keyword screenTodo      contained TODO FIXME XXX NOTE
 
 syn region  screenComment   display oneline start='#' end='$'
-                            \ contains=screenTodo,@Spell
+                          \ contains=screenTodo,@Spell
 
 syn region  screenString    display oneline start=+"+ skip=+\\"+ end=+"+
-                            \ contains=screenVariable,screenSpecial
+                          \ contains=screenVariable,screenSpecial
 
 syn region  screenLiteral   display oneline start=+'+ skip=+\\'+ end=+'+
 
-syn match   screenVariable  contained display '$\(\h\w*\|{\h\w*}\)'
+syn match   screenVariable  contained display '$\%(\h\w*\|{\h\w*}\)'
 
 syn keyword screenBoolean   on off
 
 syn match   screenNumbers   display '\<\d\+\>'
 
 syn match   screenSpecials  contained
-                            \ '%\([%aAdDhlmMstuwWyY?:{]\|[0-9]*n\|0?cC\)'
+                          \ '%\%([%aAdDhlmMstuwWyY?:{]\|[0-9]*n\|0?cC\)'
 
-syn keyword screenCommands  acladd aclchg acldel aclgrp aclumask activity
-                            \ addacl allpartial at attrcolor autodetach
-                            \ bell_msg bind bindkey bufferfile caption chacl
-                            \ chdir clear colon command compacthist console
-                            \ copy copy_regcrlf debug detach digraph dinfo
-                            \ crlf displays dumptermcap echo exec fit focus
-                            \ height help history info kill lastmsg license
-                            \ lockscreen markkeys meta msgminwait msgwait
-                            \ multiuser nethack next nonblock number only
-                            \ other partial_state password paste pastefont
-                            \ pow_break pow_detach_msg prev printcmd process
-                            \ quit readbuf readreg redisplay register
-                            \ remove removebuf reset resize screen select
-                            \ sessionname setenv shelltitle silencewait
-                            \ verbose sleep sorendition split startup_message
-                            \ stuff su suspend time title umask version wall
-                            \ width writebuf xoff xon defmode hardstatus
-                            \ altscreen break breaktype copy_reg defbreaktype
-                            \ defencoding deflog encoding eval ignorecase
-                            \ ins_reg maxwin partial pow_detach setsid source
-                            \ unsetenv windowlist windows defautonuke autonuke
-                            \ defbce bce defc1 c1 defcharset charset defescape
-                            \ escape defflow flow defkanji kanji deflogin
-                            \ login defmonitor monitor defhstatus hstatus
-                            \ defobuflimit obuflimit defscrollback scrollback
-                            \ defshell shell defsilence silence defslowpaste
-                            \ slowpaste defutf8 utf8 defwrap wrap defwritelock
-                            \ writelock defzombie zombie defgr gr hardcopy
-                            \ hardcopy_append hardcopydir hardstatus log
-                            \ logfile login logtstamp mapdefault mapnotnext
-                            \ maptimeout term termcap terminfo termcapinfo
-                            \ vbell vbell_msg vbellwait
+syn keyword screenCommands
+                          \ acladd
+                          \ aclchg
+                          \ acldel
+                          \ aclgrp
+                          \ aclumask
+                          \ activity
+                          \ addacl
+                          \ allpartial
+                          \ altscreen
+                          \ at
+                          \ attrcolor
+                          \ autodetach
+                          \ autonuke
+                          \ backtick
+                          \ bce
+                          \ bd_bc_down
+                          \ bd_bc_left
+                          \ bd_bc_right
+                          \ bd_bc_up
+                          \ bd_bell
+                          \ bd_braille_table
+                          \ bd_eightdot
+                          \ bd_info
+                          \ bd_link
+                          \ bd_lower_left
+                          \ bd_lower_right
+                          \ bd_ncrc
+                          \ bd_port
+                          \ bd_scroll
+                          \ bd_skip
+                          \ bd_start_braille
+                          \ bd_type
+                          \ bd_upper_left
+                          \ bd_upper_right
+                          \ bd_width
+                          \ bell
+                          \ bell_msg
+                          \ bind
+                          \ bindkey
+                          \ blanker
+                          \ blankerprg
+                          \ break
+                          \ breaktype
+                          \ bufferfile
+                          \ c1
+                          \ caption
+                          \ chacl
+                          \ charset
+                          \ chdir
+                          \ clear
+                          \ colon
+                          \ command
+                          \ compacthist
+                          \ console
+                          \ copy
+                          \ crlf
+                          \ debug
+                          \ defautonuke
+                          \ defbce
+                          \ defbreaktype
+                          \ defc1
+                          \ defcharset
+                          \ defencoding
+                          \ defescape
+                          \ defflow
+                          \ defgr
+                          \ defhstatus
+                          \ defkanji
+                          \ deflog
+                          \ deflogin
+                          \ defmode
+                          \ defmonitor
+                          \ defnonblock
+                          \ defobuflimit
+                          \ defscrollback
+                          \ defshell
+                          \ defsilence
+                          \ defslowpaste
+                          \ defutf8
+                          \ defwrap
+                          \ defwritelock
+                          \ detach
+                          \ digraph
+                          \ dinfo
+                          \ displays
+                          \ dumptermcap
+                          \ echo
+                          \ encoding
+                          \ escape
+                          \ eval
+                          \ exec
+                          \ fit
+                          \ flow
+                          \ focus
+                          \ gr
+                          \ hardcopy
+                          \ hardcopy_append
+                          \ hardcopydir
+                          \ hardstatus
+                          \ height
+                          \ help
+                          \ history
+                          \ hstatus
+                          \ idle
+                          \ ignorecase
+                          \ info
+                          \ kanji
+                          \ kill
+                          \ lastmsg
+                          \ layout
+                          \ license
+                          \ lockscreen
+                          \ log
+                          \ logfile
+                          \ login
+                          \ logtstamp
+                          \ mapdefault
+                          \ mapnotnext
+                          \ maptimeout
+                          \ markkeys
+                          \ maxwin
+                          \ meta
+                          \ monitor
+                          \ msgminwait
+                          \ msgwait
+                          \ multiuser
+                          \ nethack
+                          \ next
+                          \ nonblock
+                          \ number
+                          \ obuflimit
+                          \ only
+                          \ other
+                          \ partial
+                          \ password
+                          \ paste
+                          \ pastefont
+                          \ pow_break
+                          \ pow_detach
+                          \ pow_detach_msg
+                          \ prev
+                          \ printcmd
+                          \ process
+                          \ quit
+                          \ readbuf
+                          \ readreg
+                          \ redisplay
+                          \ register
+                          \ remove
+                          \ removebuf
+                          \ reset
+                          \ resize
+                          \ screen
+                          \ scrollback
+                          \ select
+                          \ sessionname
+                          \ setenv
+                          \ setsid
+                          \ shell
+                          \ shelltitle
+                          \ silence
+                          \ silencewait
+                          \ sleep
+                          \ slowpaste
+                          \ sorendition
+                          \ source
+                          \ split
+                          \ startup_message
+                          \ stuff
+                          \ su
+                          \ suspend
+                          \ term
+                          \ termcap
+                          \ termcapinfo
+                          \ terminfo
+                          \ time
+                          \ title
+                          \ umask
+                          \ unsetenv
+                          \ utf8
+                          \ vbell
+                          \ vbell_msg
+                          \ vbellwait
+                          \ verbose
+                          \ version
+                          \ wall
+                          \ width
+                          \ windowlist
+                          \ windows
+                          \ wrap
+                          \ writebuf
+                          \ writelock
+                          \ xoff
+                          \ xon
+                          \ zmodem
+                          \ zombie
 
 hi def link screenEscape    Special
 hi def link screenComment   Comment