Adjust tone calculations and defaults