Add disabled state. Bring in colors from comments branch