finalize improve color scheme