Add colorsets
add touch-punch to spiro