Cleanup and default color schemes update