Update joystick files to use joystick properly