Rework CSS Toolkit to solid base state