Performance tweaks. Color picker added