Fixes for underline. Update package resources library.