removed paint, and no longer globally storing Master enum