package structure overhaul, color picker