updated a lot of stuff like colors