Hopefully fixed all color bugs