added colors and all updates