fix generic styles
merge