Second pass at working coded layouts into theme.