Revert "Revert "Settings: No more Additional CM features""

This reverts commit 81bff9e6d5bf5778ffc47c1705b04500f22a297b.