merge from the base theme.