Separate layer definitions and hero options