diff --git a/vim/syntax/timetracker.vim b/vim/syntax/timetracker.vim
index 30ec3a3..0d2e7b1 100644
--- a/vim/syntax/timetracker.vim
+++ b/vim/syntax/timetracker.vim
@@ -9,9 +9,9 @@ endif
 
 syntax keyword timetrackerCategories Cloud Call Delivery Internal On Prem PTO transparent contained 
 syntax keyword timetrackerStartStop Begin End
-syntax keyword Customers Aetna AIG Alerus Alliant America American Ameriprise Amerisource Anthem Associated Athene Bank Bergen Broadway Canada Capital Citi Citizens Comerica Community Colorado CS Empower Equifax Fargo Federal First FNBO FNBPA GTE Hancock Hawaiian Huntington Jackson John KeyBank Life Manulife Mass Montreal Mutual National Navy New Of of One PERA PNC Regions Republic Rowe S3 Support T[.] The the TIAA United US Wells West  
+syntax keyword Customers Aetna AIG Alerus Alliant America American Ameriprise Amerisource Anthem Associated Athene Banamex Bank Bergen Broadway Canada Capital Citi CitiBanamex Citibanamex Citizens Comerica Community Colorado Credit CS Empower Equifax Fargo Federal First FNBO FNBPA GTE Hancock Hawaiian Huntington Jackson John KeyBank Kohls Life Manulife Mass Montreal Mutual National Nationwide Navy New Of of One PERA PNC Regions Republic Rowe S3 South State Support T[.] The the TIAA Union United US Wells West  
 
-syntax match timetrackerTimestamp /\d\{4}-\d\{2}-\d\{2} \d\{2}:\d\{2}:\d\{2}/ contained
+syntax match timetrackerTimestamp /\d\{4}-\%(0[135789]-\%([0-2]\d\|3[01]\)\|\%(1[02]-\%([0-2]\d\|3[01]\)\)\|0[46]-\%([0-2]\d\|30\)\|11-\%([0-2]\d\|30\)\|02-[0-2]\d\) \%([01]\d\|2[0-3]\):\%([0-5]\d\)\%(:[0-5]\d\)\{2}/ contained
 "syntax match ticket /\(#|CM-|PD-\)\d\+/
 "syntax match timetrackerTimestampError /^\(\d\{4}-\d\{2}-\d\{2} \d\{2}:\d\{2}:\d\{2}\)\@!/ contained
 syntax match timetrackerTask /.*/ contained
@@ -19,8 +19,9 @@ syntax match timetrackerTask /.*/ contained
 "syntax match timetrackerTimestampError /^\(\(\d\{4}-\d\{2}-\d\{2} \d\{2}:\d\{2}:\d\{2}\)\@!\)/ transparent contained
 
 
-syntax region errTimestamp     matchgroup=timestamp start=/^\(\d\{4}-\d\{2}-\d\{2} \d\{2}:\d\{2}:\d\{2}\)\@!/         end=/:  /  contains=timetrackerTimestamp
-syntax region timestampGroup   start=/\d\{4}-\d\{2}-\d\{2} \d\{2}:\d\{2}:\d\{2}/ end=/:  /
+"syntax region errTimestamp     matchgroup=timestamp start=/^\(\d\{4}-\(0\d\|1[0-2]\)-\d\{2} \d\{2}:\d\{2}:\d\{2}\)\@!/         end=/:  /  contains=timetrackerTimestamp
+syntax region timestampGroup   start=/^/ end=/:  /  contains=timetrackerTimestamp
+syntax region errTimestamp     matchgroup=timestamp start="^\%(\d\{4}-\%(0[135789]-\%([0-2]\d\|3[01]\)\|\%(1[02]-\%([0-2]\d\|3[01]\)\)\|0[46]-\%([0-2]\d\|30\)\|11-\%([0-2]\d\|30\)\|02-[0-2]\d\) \%([01]\d\|2[0-3]\)\%(:[0-5]\d\)\{2}\)\@!"         end=":  "
 syntax region category         start=/\[/        end=/\]/          contains=timetrackerCategories
 syntax region ticket           start=/\(#\|CM-\|PD-\)\d\{-1}/    end=/\d /
 "syntax region item             matchgroup=task   start=/\]\s[\k ]\+/  end=/$/  contains=ticket