Support for css inherit + need for clean-ups