Moved labels for roads/trails/rail, peaks and point features to separate layers (to ensure rendering on top).
Factored out common DB settings in carto .mml templates