Revert "BRING IN THE OLD"

This reverts commit b38c30fd496b2c09ab23d4f567199f02f59279ee.

Conflicts:
	res/values/cm_strings.xml
	res/values/colors.xml