Revert "Settings: No more Additional CM features"

This reverts commit f050342051e20b3bf8785140566e323e6c69757f.