Painting improvements patch (was: Use a HashMap for paintings…)