colors update option + some architectural stuff