Modified colors and other bug fixes