Touchscreen changes - Fix S2W