finalized theme // prepping for domain work