merge
Light color scheme and some changes