modularize, change colors