updates to theme implementation