build: Small bugfix and created templates