diff --git a/index.html b/index.html
index 1e6c45a..11d5bbd 100644
--- a/index.html
+++ b/index.html
@@ -237,40 +237,6 @@
       <div class='description'>Amount of smoothing applied</div>
       </li>
   
-      <li id='section-4-polygon-meta-output'><div>
-        <span class='css'><a href='#section-4-polygon-meta-output'>polygon-meta-output</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter Output)</span>
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-5-polygon-meta-writer'><div>
-        <span class='css'><a href='#section-5-polygon-meta-writer'>polygon-meta-writer</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter specified)</span>
-      </small>
-      
-      
-      </li>
-  
   </ul>
 </div>
 
@@ -439,42 +405,8 @@
       <div class='description'>Amount of smoothing applied</div>
       </li>
   
-      <li id='section-9-line-meta-output'><div>
-        <span class='css'><a href='#section-9-line-meta-output'>line-meta-output</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter Output)</span>
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-10-line-meta-writer'><div>
-        <span class='css'><a href='#section-10-line-meta-writer'>line-meta-writer</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-11-line-rasterizer'><div>
-        <span class='css'><a href='#section-11-line-rasterizer'>line-rasterizer</a></span>
+      <li id='section-9-line-rasterizer'><div>
+        <span class='css'><a href='#section-9-line-rasterizer'>line-rasterizer</a></span>
         <small class='types'>
           
           <span class='type'>full</span>
@@ -627,7 +559,7 @@
       </div>
       
       <small>Default:
-        5
+        10
         
       </small>
       
@@ -644,7 +576,7 @@
       </div>
       
       <small>Default:
-        5
+        10
         
       </small>
       
@@ -753,40 +685,6 @@
       <div class='description'>An SVG transformation definition</div>
       </li>
   
-      <li id='section-15-marker-meta-output'><div>
-        <span class='css'><a href='#section-15-marker-meta-output'>marker-meta-output</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter Output)</span>
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-16-marker-meta-writer'><div>
-        <span class='css'><a href='#section-16-marker-meta-writer'>marker-meta-writer</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        none
-        
-      </small>
-      
-      
-      </li>
-  
   </ul>
 </div>
 
@@ -1234,40 +1132,6 @@
       <div class='description'>Define how text in a shield's label is justified</div>
       </li>
   
-      <li id='section-26-shield-meta-output'><div>
-        <span class='css'><a href='#section-26-shield-meta-output'>shield-meta-output</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter Output)</span>
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-27-shield-meta-writer'><div>
-        <span class='css'><a href='#section-27-shield-meta-writer'>shield-meta-writer</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        
-      </small>
-      
-      
-      </li>
-  
   </ul>
 </div>
 
@@ -1292,40 +1156,6 @@
       <div class='description'>An image file to be repeated and warped along a line</div>
       </li>
   
-      <li id='section-1-line-pattern-meta-output'><div>
-        <span class='css'><a href='#section-1-line-pattern-meta-output'>line-pattern-meta-output</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter Output)</span>
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-2-line-pattern-meta-writer'><div>
-        <span class='css'><a href='#section-2-line-pattern-meta-writer'>line-pattern-meta-writer</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        
-      </small>
-      
-      
-      </li>
-  
   </ul>
 </div>
 
@@ -1386,40 +1216,6 @@
       <div class='description'>Level of antialiasing of polygon pattern edges</div>
       </li>
   
-      <li id='section-3-polygon-pattern-meta-output'><div>
-        <span class='css'><a href='#section-3-polygon-pattern-meta-output'>polygon-pattern-meta-output</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter Output)</span>
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-4-polygon-pattern-meta-writer'><div>
-        <span class='css'><a href='#section-4-polygon-pattern-meta-writer'>polygon-pattern-meta-writer</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        
-      </small>
-      
-      
-      </li>
-  
   </ul>
 </div>
 
@@ -1523,6 +1319,23 @@
       <div class='description'>The scaling algorithm used to making different resolution versions of this raster layer. Bilinear is a good compromise between speed and accuracy, while lanczos gives the highest quality.</div>
       </li>
   
+      <li id='section-4-raster-mesh-size'><div>
+        <span class='css'><a href='#section-4-raster-mesh-size'>raster-mesh-size</a></span>
+        <small class='types'>
+          
+          <span class='type'><a href='#integer'>integer</a></span>
+          
+        </small>
+      </div>
+      
+      <small>Default:
+        16
+        <span class='description'>(Reprojection mesh will be 1/16 of the resolution of the source image)</span>
+      </small>
+      
+      <div class='description'>A reduced resolution mesh is used for raster reprojection, and the total image size is divided by the mesh-size to determine the quality of that mesh. Values for mesh-size larger than the default will result in faster reprojection but might lead to distortion.</div>
+      </li>
+  
   </ul>
 </div>
 
@@ -1634,40 +1447,6 @@
       <div class='description'>SVG transformation definition</div>
       </li>
   
-      <li id='section-6-point-meta-output'><div>
-        <span class='css'><a href='#section-6-point-meta-output'>point-meta-output</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter Output)</span>
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-7-point-meta-writer'><div>
-        <span class='css'><a href='#section-7-point-meta-writer'>point-meta-writer</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        
-      </small>
-      
-      
-      </li>
-  
   </ul>
 </div>
 
@@ -2188,40 +1967,6 @@
       <div class='description'>Set the text alignment.</div>
       </li>
   
-      <li id='section-30-text-meta-output'><div>
-        <span class='css'><a href='#section-30-text-meta-output'>text-meta-output</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        <span class='description'>(No MetaWriter Output)</span>
-      </small>
-      
-      
-      </li>
-  
-      <li id='section-31-text-meta-writer'><div>
-        <span class='css'><a href='#section-31-text-meta-writer'>text-meta-writer</a></span>
-        <small class='types'>
-          
-          <span class='type'><a href='#string'>string</a></span>
-          
-        </small>
-      </div>
-      
-      <small>Default:
-        
-        
-      </small>
-      
-      
-      </li>
-  
   </ul>
 </div>
 
diff --git a/lib/carto/tree/reference.json b/lib/carto/tree/reference.json
index db0702f..811c50c 100644
--- a/lib/carto/tree/reference.json
+++ b/lib/carto/tree/reference.json
@@ -7,18 +7,6 @@
         "filter-mode": {
         }
     },
-    "meta-writer": {
-        "name": {
-        },
-        "type": {
-        },
-        "file": {
-        },
-        "default-output": {
-        },
-        "output-empty": {
-        }
-    },
     "font-set": {
         "name": {
         },
@@ -143,18 +131,6 @@
                 "default-meaning": "no smoothing",
                 "range": "0-1",
                 "doc": "Amount of smoothing applied"
-            },
-            "meta-output": {
-                "css": "polygon-meta-output",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter Output"
-            },
-            "meta-writer": {
-                "css": "polygon-meta-writer",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter specified"
             }
         },
         "line": {
@@ -230,17 +206,6 @@
                 "range": "0-1",
                 "doc": "Amount of smoothing applied"
             },
-            "meta-output": {
-                "css": "line-meta-output",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter Output"
-            },
-            "meta-writer": {
-                "css": "line-meta-writer",
-                "type": "string",
-                "default-value": ""
-            },
             "rasterizer": {
                 "css": "line-rasterizer",
                 "type": [
@@ -303,13 +268,13 @@
             },
             "width": {
                 "css": "marker-width",
-                "default-value": 5,
+                "default-value": 10,
                 "doc": "The height of the marker, if using one of the default types.",
                 "type": "float"
             },
             "height": {
                 "css": "marker-height",
-                "default-value": 5,
+                "default-value": 10,
                 "doc": "The height of the marker, if using one of the default types.",
                 "type": "float"
             },
@@ -351,17 +316,6 @@
                 "default-value": "",
                 "default-meaning": "no transformation",
                 "type": "string"
-            },
-            "meta-output": {
-                "css": "marker-meta-output",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter Output"
-            },
-            "meta-writer": {
-                "css": "marker-meta-writer",
-                "type": "string",
-                "default-value": "none"
             }
         },
         "shield": {
@@ -536,17 +490,6 @@
                 "type": "string",
                 "doc": "Define how text in a shield's label is justified",
                 "default-value": "middle"
-            },
-            "meta-output": {
-                "css": "shield-meta-output",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter Output"
-            },
-            "meta-writer": {
-                "css": "shield-meta-writer",
-                "type": "string",
-                "default-value": ""
             }
         },
         "line-pattern": {
@@ -556,17 +499,6 @@
                 "default-value": "none",
                 "required": true,
                 "doc": "An image file to be repeated and warped along a line"
-            },
-            "meta-output": {
-                "css": "line-pattern-meta-output",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter Output"
-            },
-            "meta-writer": {
-                "css": "line-pattern-meta-writer",
-                "type": "string",
-                "default-value": ""
             }
         },
         "polygon-pattern": {
@@ -591,17 +523,6 @@
                 "default-meaning": "fully antialiased",
                 "range": "0-1",
                 "doc": "Level of antialiasing of polygon pattern edges"
-            },
-            "meta-output": {
-                "css": "polygon-pattern-meta-output",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter Output"
-            },
-            "meta-writer": {
-                "css": "polygon-pattern-meta-writer",
-                "type": "string",
-                "default-value": ""
             }
         },
         "raster": {
@@ -648,6 +569,13 @@
                 ],
                 "default-value": "fast",
                 "doc": "The scaling algorithm used to making different resolution versions of this raster layer. Bilinear is a good compromise between speed and accuracy, while lanczos gives the highest quality."
+            },
+            "mesh-size": {
+                "css": "raster-mesh-size",
+                "default-value": 16,
+                "default-meaning": "Reprojection mesh will be 1/16 of the resolution of the source image",
+                "type": "integer",
+                "doc": "A reduced resolution mesh is used for raster reprojection, and the total image size is divided by the mesh-size to determine the quality of that mesh. Values for mesh-size larger than the default will result in faster reprojection but might lead to distortion."
             }
         },
         "point": {
@@ -694,17 +622,6 @@
                 "default-value": "",
                 "default-meaning": "No transformation",
                 "doc": "SVG transformation definition"
-            },
-            "meta-output": {
-                "css": "point-meta-output",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter Output"
-            },
-            "meta-writer": {
-                "css": "point-meta-writer",
-                "type": "string",
-                "default-value": ""
             }
         },
         "text": {
@@ -916,17 +833,6 @@
                 ],
                 "doc": "Set the text alignment.",
                 "default-value": "center"
-            },
-            "meta-output": {
-                "css": "text-meta-output",
-                "type": "string",
-                "default-value": "",
-                "default-meaning": "No MetaWriter Output"
-            },
-            "meta-writer": {
-                "css": "text-meta-writer",
-                "type": "string",
-                "default-value": ""
             }
         },
         "building": {