more modular templates

Signed-off-by: Mikolaj Szabo <savingprivateblue@gmail.com>