added namespace and color reference fix'd