rework CSS to be more future-proof