0.0.4
css changes for new templates
conflicts