diff --git a/src/components/sources/SourceTypeEditor.jsx b/src/components/sources/SourceTypeEditor.jsx
index 403a9807..c55b46d2 100644
--- a/src/components/sources/SourceTypeEditor.jsx
+++ b/src/components/sources/SourceTypeEditor.jsx
@@ -6,100 +6,6 @@ import StringInput from '../inputs/StringInput'
 import NumberInput from '../inputs/NumberInput'
 import SelectInput from '../inputs/SelectInput'
 
-class DemJSONSourceEditor extends React.Component {
-  static propTypes = {
-    source: PropTypes.object.isRequired,
-    onChange: PropTypes.func.isRequired,
-  }
-
-  render() {
-    return <div>
-      <InputBlock label={"Raster DEM URL"} doc={styleSpec.latest.source_raster_dem.url.doc}>
-        <StringInput
-          value={this.props.source.url}
-          onChange={url => this.props.onChange({
-            ...this.props.source,
-            url: url
-          })}
-        />
-      </InputBlock>
-      <InputBlock label={"Encoding"} doc={styleSpec.latest.source_raster_dem.encoding.doc}>
-        <SelectInput
-          options={Object.keys(styleSpec.latest.source_raster_dem.encoding.values)}
-          onChange={encoding => this.props.onChange({
-            ...this.props.source,
-            encoding: encoding
-          })}
-          value={this.props.source.encoding || styleSpec.latest.source_raster_dem.encoding.default}
-        />
-      </InputBlock>
-    </div>
-  }
-}
-
-class DemURLSourceEditor extends React.Component {
-  static propTypes = {
-    source: PropTypes.object.isRequired,
-    onChange: PropTypes.func.isRequired,
-  }
-
-  changeTileUrl(idx, value) {
-    const tiles = this.props.source.tiles.slice(0)
-    tiles[idx] = value
-    this.props.onChange({
-      ...this.props.source,
-      tiles: tiles
-    })
-  }
-
-  renderTileUrls() {
-    const prefix = ['1st', '2nd', '3rd', '4th', '5th', '6th', '7th']
-    const tiles = this.props.source.tiles || []
-    return tiles.map((tileUrl, tileIndex) => {
-      return <InputBlock key={tileIndex} label={prefix[tileIndex] + " Tile URL"} doc={styleSpec.latest.source_vector.tiles.doc}>
-        <StringInput
-          value={tileUrl}
-          onChange={this.changeTileUrl.bind(this, tileIndex)}
-        />
-      </InputBlock>
-    })
-  }
-
-  render() {
-    return <div>
-      {this.renderTileUrls()}
-      <InputBlock label={"Min Zoom"} doc={styleSpec.latest.source_vector.minzoom.doc}>
-        <NumberInput
-          value={this.props.source.minzoom || 0}
-          onChange={minzoom => this.props.onChange({
-            ...this.props.source,
-            minzoom: minzoom
-          })}
-        />
-      </InputBlock>
-      <InputBlock label={"Max Zoom"} doc={styleSpec.latest.source_vector.maxzoom.doc}>
-        <NumberInput
-          value={this.props.source.maxzoom || 22}
-          onChange={maxzoom => this.props.onChange({
-            ...this.props.source,
-            maxzoom: maxzoom
-          })}
-        />
-      </InputBlock>
-      <InputBlock label={"Encoding"} doc={styleSpec.latest.source_raster_dem.encoding.doc}>
-        <SelectInput
-          options={Object.keys(styleSpec.latest.source_raster_dem.encoding.values)}
-          onChange={encoding => this.props.onChange({
-            ...this.props.source,
-            encoding: encoding
-          })}
-          value={this.props.source.encoding || styleSpec.latest.source_raster_dem.encoding.default}
-        />
-      </InputBlock>
-  </div>
-
-  }
-}
 
 class TileJSONSourceEditor extends React.Component {
   static propTypes = {
@@ -108,15 +14,18 @@ class TileJSONSourceEditor extends React.Component {
   }
 
   render() {
-    return <InputBlock label={"TileJSON URL"} doc={styleSpec.latest.source_vector.url.doc}>
-      <StringInput
-        value={this.props.source.url}
-        onChange={url => this.props.onChange({
-          ...this.props.source,
-          url: url
-        })}
-      />
-    </InputBlock>
+    return <div>
+      <InputBlock label={"TileJSON URL"} doc={styleSpec.latest.source_vector.url.doc}>
+        <StringInput
+          value={this.props.source.url}
+          onChange={url => this.props.onChange({
+            ...this.props.source,
+            url: url
+          })}
+        />
+      </InputBlock>
+      {this.props.children}
+    </div>
   }
 }
 
@@ -169,6 +78,7 @@ class TileURLSourceEditor extends React.Component {
           })}
         />
       </InputBlock>
+      {this.props.children}
   </div>
 
   }
@@ -211,8 +121,19 @@ class SourceTypeEditor extends React.Component {
       case 'tilexyz_vector': return <TileURLSourceEditor {...commonProps} />
       case 'tilejson_raster': return <TileJSONSourceEditor {...commonProps} />
       case 'tilexyz_raster': return <TileURLSourceEditor {...commonProps} />
-      case 'tilejson_raster-dem': return <DemJSONSourceEditor {...commonProps} />
-      case 'tilexyz_raster-dem': return <DemURLSourceEditor {...commonProps} />
+      case 'tilejson_raster-dem': return <TileJSONSourceEditor {...commonProps} />
+      case 'tilexyz_raster-dem': return <TileURLSourceEditor {...commonProps}>
+        <InputBlock label={"Encoding"} doc={styleSpec.latest.source_raster_dem.encoding.doc}>
+          <SelectInput
+            options={Object.keys(styleSpec.latest.source_raster_dem.encoding.values)}
+            onChange={encoding => this.props.onChange({
+              ...this.props.source,
+              encoding: encoding
+            })}
+            value={this.props.source.encoding || styleSpec.latest.source_raster_dem.encoding.default}
+          />
+        </InputBlock>
+      </TileURLSourceEditor>
       default: return null
     }
   }