[master] Move templates into options
[master] Remove columns parameter, improve README