updated with newest theme from ERG