Added "hover/non-hover" option