Fixed in custom theme and base config