Cleaned xmls and updated touchpad