Color picker derps && additions
Signed-off-by: PipelinerArd <kristoferard@gmail.com>

Conflicts:
	res/values/strings.xml