Reorganized CSS addons