Big merge with the patch selector and the accelerometer support