Finish templetes integration