including new style, along with much changes to the OpenLayers bit