Separate keywords from tokens in headed lists
ignore /ui directory created by Git
Update unit tests