Final round of tweaks for tomorrows demo + colorpicker assets