Move two more functions out of Colors.cpp