Fix Up Derps

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