renamed variable names and moved color consts