Kolonize
fix template
fix template again
template adjustment
Merge branch 'experimental/kolon'
remove smart match