Changed TokenTpl template - that was tricky
Code cleanup and fixed broken merge