rejig templates, deprecate 'empty' template and rubocop them