substate (+ minor change to outline-offset)

And sneak in a change of outline-offset on numeric widget

Test Plan: see that outline-offset works