General enhancements, updated colors