Update Ace 2 settings from codina cm 11 branch