united color sheme
bug fixes and color sheme changes