Also change types of Touch and Window