more rules
update rules, tweak colors