Updated two finger and double tap criteria to be Win8 and Win7 agnostic