Mise à jour kitchen-sink

- Moving content into tmpl