Use COLORS / DEFAULT_COLOR directly
Fix off-by-one comparison