Fix column highlighting
Update keywords