Changed templates to define thick vs. thin