master - NEW: fixed the weird color thing