More polishing - colors now available from corresponding variables