Revert "Revert "actually commiting the template stuff, just fooling around with colors""

This reverts commit 898c512277544da1da8667df1faedfba44c5d9aa.