Fix wood colours

And add new shapes for wooden logs.