Slight theme updates. Linked buttons, remove shade() calls