Changed color scheme, more work to final