Cleaned up and parameterized carto templates