diff --git a/config/datatypes_conf.xml.sample b/config/datatypes_conf.xml.sample
index 8e8445aadac..9c058d1200d 100644
--- a/config/datatypes_conf.xml.sample
+++ b/config/datatypes_conf.xml.sample
@@ -3,7 +3,7 @@
   <registration converters_path="lib/galaxy/datatypes/converters" display_path="display_applications">
     <datatype extension="ab1" type="galaxy.datatypes.binary:Ab1" mimetype="application/octet-stream" display_in_upload="true" description="A binary sequence file in 'ab1' format with a '.ab1' file extension.  You must manually select this 'File Format' when uploading the file." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Ab1"/>
     <datatype extension="afg" type="galaxy.datatypes.assembly:Amos" display_in_upload="false" />
-    <datatype extension="arff" type="galaxy.datatypes.text:Arff" mimetype="text/plain" display_in_upload="True" />
+    <datatype extension="arff" type="galaxy.datatypes.text:Arff" mimetype="text/plain" display_in_upload="true" />
     <datatype extension="asn1" type="galaxy.datatypes.data:GenericAsn1" mimetype="text/plain" display_in_upload="true" />
     <datatype extension="asn1-binary" type="galaxy.datatypes.binary:GenericAsn1Binary" mimetype="application/octet-stream" display_in_upload="true" />
     <datatype extension="axt" type="galaxy.datatypes.sequence:Axt" display_in_upload="true" description="blastz pairwise alignment format.  Each alignment block in an axt file contains three lines: a summary line and 2 sequence lines.  Blocks are separated from one another by blank lines.  The summary line contains chromosomal position and size information about the alignment. It consists of 9 required fields." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Axt"/>
@@ -47,8 +47,8 @@
       <display file="igb/bigwig.xml" />
       <display file="igv/bigwig.xml" />
     </datatype>
-    <datatype extension="cxb" type="galaxy.datatypes.binary:Binary" mimetype="application/octet-stream" subclass="True" display_in_upload="true" description="Cuffquant output format" />
-    <datatype extension="chrint" type="galaxy.datatypes.interval:ChromatinInteractions" display_in_upload="True">
+    <datatype extension="cxb" type="galaxy.datatypes.binary:Binary" mimetype="application/octet-stream" subclass="true" display_in_upload="true" description="Cuffquant output format" />
+    <datatype extension="chrint" type="galaxy.datatypes.interval:ChromatinInteractions" display_in_upload="true">
       <converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/>
       <converter file="interval_to_tabix_converter.xml" target_datatype="tabix" depends_on="bgzip"/>
       <converter file="bed_gff_or_vcf_to_bigwig_converter.xml" target_datatype="bigwig"/>
@@ -56,13 +56,13 @@
     <datatype extension="csv" type="galaxy.datatypes.tabular:CSV" display_in_upload="true" />
     <datatype extension="tsv" type="galaxy.datatypes.tabular:TSV" display_in_upload="true" />
     <datatype extension="customtrack" type="galaxy.datatypes.interval:CustomTrack"/>
-    <datatype extension="bowtie_color_index" type="galaxy.datatypes.ngsindex:BowtieColorIndex" mimetype="text/html" display_in_upload="False"/>
-    <datatype extension="bowtie_base_index" type="galaxy.datatypes.ngsindex:BowtieBaseIndex" mimetype="text/html" display_in_upload="False"/>
+    <datatype extension="bowtie_color_index" type="galaxy.datatypes.ngsindex:BowtieColorIndex" mimetype="text/html" display_in_upload="false"/>
+    <datatype extension="bowtie_base_index" type="galaxy.datatypes.ngsindex:BowtieBaseIndex" mimetype="text/html" display_in_upload="false"/>
     <datatype extension="csfasta" type="galaxy.datatypes.sequence:csFasta" display_in_upload="true"/>
     <datatype extension="data" type="galaxy.datatypes.data:Data" mimetype="application/octet-stream" max_optional_metadata_filesize="1048576" />
-    <datatype extension="data_manager_json" type="galaxy.datatypes.text:Json" mimetype="application/json" subclass="True" display_in_upload="False"/>
+    <datatype extension="data_manager_json" type="galaxy.datatypes.text:Json" mimetype="application/json" subclass="true" display_in_upload="false"/>
     <datatype extension="dbn" type="galaxy.datatypes.sequence:DotBracket" display_in_upload="true" description="Dot-Bracket format is a text-based format for storing both an RNA sequence and its corresponding 2D structure." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Dbn"/>
-    <datatype extension="fai" type="galaxy.datatypes.tabular:Tabular" display_in_upload="true" subclass="True" description="A Fasta Index File is a text file consisting of lines each with five TAB-delimited columns : Name, Length, offset, linebases, Linewidth" description_url="http://www.htslib.org/doc/faidx.html" />
+    <datatype extension="fai" type="galaxy.datatypes.tabular:Tabular" display_in_upload="true" subclass="true" description="A Fasta Index File is a text file consisting of lines each with five TAB-delimited columns : Name, Length, offset, linebases, Linewidth" description_url="http://www.htslib.org/doc/faidx.html" />
     <datatype extension="fasta" type="galaxy.datatypes.sequence:Fasta" display_in_upload="true" description="A sequence in FASTA format consists of a single-line description, followed by lines of sequence data. The first character of the description line is a greater-than ('>') symbol in the first column. All lines should be shorter than 80 characters." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Fasta">
       <converter file="fasta_to_tabular_converter.xml" target_datatype="tabular"/>
       <converter file="fasta_to_bowtie_base_index_converter.xml" target_datatype="bowtie_base_index"/>
@@ -70,7 +70,7 @@
       <converter file="fasta_to_2bit.xml" target_datatype="twobit"/>
       <converter file="fasta_to_len.xml" target_datatype="len"/>
       <converter file="fasta_to_fai.xml" target_datatype="fai"/>
-      <display file="igv/genome_fasta.xml" inherit="True"/>
+      <display file="igv/genome_fasta.xml" inherit="true"/>
     </datatype>
     <datatype extension="fastq" type="galaxy.datatypes.sequence:Fastq" display_in_upload="true" description="FASTQ format is a text-based format for storing both a biological sequence (usually nucleotide sequence) and its corresponding quality scores." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Fastq">
         <converter file="fastq_to_fqtoc.xml" target_datatype="fqtoc"/>
@@ -98,9 +98,9 @@
       <converter file="gff_to_interval_index_converter.xml" target_datatype="interval_index"/>
       <converter file="bed_gff_or_vcf_to_bigwig_converter.xml" target_datatype="bigwig"/>
       <converter file="gff_to_fli_converter.xml" target_datatype="fli"/>
-      <display file="ensembl/ensembl_gff.xml" inherit="True"/>
-      <display file="igv/gff.xml" inherit="True"/>
-      <!-- <display file="gbrowse/gbrowse_gff.xml" inherit="True" /> -->
+      <display file="ensembl/ensembl_gff.xml" inherit="true"/>
+      <display file="igv/gff.xml" inherit="true"/>
+      <!-- <display file="gbrowse/gbrowse_gff.xml" inherit="true" /> -->
     </datatype>
     <datatype extension="gff3" type="galaxy.datatypes.interval:Gff3" display_in_upload="true" description="The GFF3 format addresses the most common extensions to GFF, while preserving backward compatibility with previous formats." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#GFF3"/>
     <datatype extension="gif" type="galaxy.datatypes.images:Gif" mimetype="image/gif"/>
@@ -110,8 +110,8 @@
         <converter file="bed_gff_or_vcf_to_bigwig_converter.xml" target_datatype="bigwig"/>
         <display file="igb/gtf.xml" />
     </datatype>
-    <datatype extension="toolshed.gz" type="galaxy.datatypes.binary:Binary" mimetype="multipart/x-gzip" subclass="True" />
-    <datatype extension="h5" type="galaxy.datatypes.binary:H5" mimetype="application/octet-stream" display_in_upload="True"/>
+    <datatype extension="toolshed.gz" type="galaxy.datatypes.binary:Binary" mimetype="multipart/x-gzip" subclass="true" />
+    <datatype extension="h5" type="galaxy.datatypes.binary:H5" mimetype="application/octet-stream" display_in_upload="true"/>
     <datatype extension="html" type="galaxy.datatypes.text:Html" mimetype="text/html"/>
     <datatype extension="interval" type="galaxy.datatypes.interval:Interval" display_in_upload="true" description="File must start with definition line in the following format (columns may be in any order)." >
       <converter file="interval_to_bed_converter.xml" target_datatype="bed"/>
@@ -121,22 +121,34 @@
       <converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/>
       <converter file="interval_to_tabix_converter.xml" target_datatype="tabix" depends_on="bgzip"/>
         <converter file="interval_to_bigwig_converter.xml" target_datatype="bigwig"/>
-      <!-- <display file="ucsc/interval_as_bed.xml" inherit="True" /> -->
-      <display file="ensembl/ensembl_interval_as_bed.xml" inherit="True"/>
-      <display file="gbrowse/gbrowse_interval_as_bed.xml" inherit="True"/>
-      <display file="rviewer/bed.xml" inherit="True"/>
-      <display file="igv/interval_as_bed.xml" inherit="True"/>
+      <!-- <display file="ucsc/interval_as_bed.xml" inherit="true" /> -->
+      <display file="ensembl/ensembl_interval_as_bed.xml" inherit="true"/>
+      <display file="gbrowse/gbrowse_interval_as_bed.xml" inherit="true"/>
+      <display file="rviewer/bed.xml" inherit="true"/>
+      <display file="igv/interval_as_bed.xml" inherit="true"/>
     </datatype>
-    <datatype extension="picard_interval_list" type="galaxy.datatypes.tabular:Tabular" subclass="True" display_in_upload="True">
+    <datatype extension="picard_interval_list" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true">
       <converter file="picard_interval_list_to_bed6_converter.xml" target_datatype="bed6"/>
     </datatype>
-    <datatype extension="gatk_interval" type="galaxy.datatypes.data:Text" subclass="True" display_in_upload="True"/>
-    <datatype extension="gatk_report" type="galaxy.datatypes.data:Text" subclass="True" display_in_upload="True"/>
-    <datatype extension="gatk_dbsnp" type="galaxy.datatypes.tabular:Tabular" subclass="True" display_in_upload="True"/>
-    <datatype extension="gatk_tranche" type="galaxy.datatypes.tabular:Tabular" subclass="True" display_in_upload="True"/>
-    <datatype extension="gatk_recal" type="galaxy.datatypes.tabular:Tabular" subclass="True" display_in_upload="True"/>
+    <datatype extension="gatk_interval" type="galaxy.datatypes.data:Text" subclass="true" display_in_upload="true"/>
+    <datatype extension="gatk_report" type="galaxy.datatypes.data:Text" subclass="true" display_in_upload="true"/>
+    <datatype extension="gatk_dbsnp" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true"/>
+    <datatype extension="gatk_tranche" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true"/>
+    <datatype extension="gatk_recal" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true"/>
     <datatype extension="jpg" type="galaxy.datatypes.images:Jpg" mimetype="image/jpeg"/>
     <datatype extension="tiff" type="galaxy.datatypes.images:Tiff" mimetype="image/tiff" display_in_upload="true"/>
+    <datatype extension="tf2" type="galaxy.datatypes.images:Tiff" subclass="true" display_in_upload="false"/>
+    <datatype extension="tf8" type="galaxy.datatypes.images:Tiff" subclass="true" display_in_upload="false"/>
+    <datatype extension="btf" type="galaxy.datatypes.images:Tiff" subclass="true" display_in_upload="false"/>
+    <datatype extension="tif" type="galaxy.datatypes.images:Tiff" subclass="true" display_in_upload="false"/>
+    <datatype extension="svs" type="galaxy.datatypes.images:Tiff" subclass="true" display_in_upload="false"/>
+    <datatype extension="scn" type="galaxy.datatypes.images:Tiff" subclass="true" display_in_upload="false"/>
+    <datatype extension="bif" type="galaxy.datatypes.images:Tiff" subclass="true" display_in_upload="false"/>
+    <datatype extension="vms" type="galaxy.datatypes.images:Hamamatsu" mimetype="image/hamamatsu"/>
+    <datatype extension="vmu" type="galaxy.datatypes.images:Hamamatsu" subclass="true" display_in_upload="false"/>
+    <datatype extension="ndpi" type="galaxy.datatypes.images:Hamamatsu" subclass="true" display_in_upload="false"/>
+    <datatype extension="mrxs" type="galaxy.datatypes.images:Mirax" mimetype="image/mirax"/>
+    <datatype extension="svslide" type="galaxy.datatypes.images:Sakura" mimetype="image/sakura"/>
     <datatype extension="bmp" type="galaxy.datatypes.images:Bmp" mimetype="image/bmp"/>
     <datatype extension="im" type="galaxy.datatypes.images:Im" mimetype="image/im"/>
     <datatype extension="pcd" type="galaxy.datatypes.images:Pcd" mimetype="image/pcd"/>
@@ -148,19 +160,19 @@
     <datatype extension="rgb" type="galaxy.datatypes.images:Rgb" mimetype="image/rgb"/>
     <datatype extension="pbm" type="galaxy.datatypes.images:Pbm" mimetype="image/pbm"/>
     <datatype extension="pgm" type="galaxy.datatypes.images:Pgm" mimetype="image/pgm"/>
-    <datatype extension="rna_eps" type="galaxy.datatypes.sequence:RNADotPlotMatrix" mimetype="image/eps" display_in_upload="True"/>
-    <datatype extension="zip" type="galaxy.datatypes.binary:CompressedZipArchive" display_in_upload="True"/>
-    <datatype extension="tar" type="galaxy.datatypes.binary:CompressedArchive" subclass="True" display_in_upload="True"/>
+    <datatype extension="rna_eps" type="galaxy.datatypes.sequence:RNADotPlotMatrix" mimetype="image/eps" display_in_upload="true"/>
+    <datatype extension="zip" type="galaxy.datatypes.binary:CompressedZipArchive" display_in_upload="true"/>
+    <datatype extension="tar" type="galaxy.datatypes.binary:CompressedArchive" subclass="true" display_in_upload="true"/>
     <!-- Proteomics Datatypes -->
-    <datatype extension="pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml" display_in_upload="True"/>
-    <datatype extension="raw_pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml" subclass="True"/>
-    <datatype extension="peptideprophet_pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml" subclass="True"/>
-    <datatype extension="interprophet_pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml" subclass="True"/>
-    <datatype extension="protxml" type="galaxy.datatypes.proteomics:ProtXML" mimetype="application/xml" display_in_upload="True" />
+    <datatype extension="pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml" display_in_upload="true"/>
+    <datatype extension="raw_pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml" subclass="true"/>
+    <datatype extension="peptideprophet_pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml" subclass="true"/>
+    <datatype extension="interprophet_pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml" subclass="true"/>
+    <datatype extension="protxml" type="galaxy.datatypes.proteomics:ProtXML" mimetype="application/xml" display_in_upload="true" />
     <datatype extension="trafoxml" type="galaxy.datatypes.xml:GenericXml" mimetype="application/xml"
-        subclass="True" display_in_upload="True" description="Transformation of retention times"/>
+        subclass="true" display_in_upload="true" description="Transformation of retention times"/>
     <datatype extension="qcml" type="galaxy.datatypes.xml:GenericXml" mimetype="application/xml"
-        subclass="True" display_in_upload="True" description="Quality control data in XML format (https://code.google.com/p/qcml/)."/>
+        subclass="true" display_in_upload="true" description="Quality control data in XML format (https://code.google.com/p/qcml/)."/>
     <datatype extension="pepxml.tsv" type="galaxy.datatypes.proteomics:PepXmlReport" display_in_upload="true" />
     <datatype extension="protxml.tsv" type="galaxy.datatypes.proteomics:ProtXmlReport" display_in_upload="true" />
     <datatype extension="mascotdat" type="galaxy.datatypes.proteomics:MascotDat" display_in_upload="false" />
@@ -185,10 +197,10 @@
     <datatype extension="hlf" type="galaxy.datatypes.proteomics:XHunterAslFormat" mimetype="application/octet-stream" display_in_upload="true" />
     <datatype extension="idpdb" type="galaxy.datatypes.binary:IdpDB" mimetype="application/octet-stream" display_in_upload="true" />
     <datatype extension="sf3" type="galaxy.datatypes.proteomics:Sf3" display_in_upload="true" />
-    <datatype extension="cps" type="galaxy.datatypes.binary:Binary" subclass="True" display_in_upload="true" />
-    <datatype extension="ct" type="galaxy.datatypes.tabular:ConnectivityTable" display_in_upload="True"/>
-    <datatype extension="searchgui_archive" type="galaxy.datatypes.binary:SearchGuiArchive" display_in_upload="True"/>
-    <datatype extension="peptideshaker_archive" type="galaxy.datatypes.binary:CompressedArchive" subclass="True" display_in_upload="True"/>
+    <datatype extension="cps" type="galaxy.datatypes.binary:Binary" subclass="true" display_in_upload="true" />
+    <datatype extension="ct" type="galaxy.datatypes.tabular:ConnectivityTable" display_in_upload="true"/>
+    <datatype extension="searchgui_archive" type="galaxy.datatypes.binary:SearchGuiArchive" display_in_upload="true"/>
+    <datatype extension="peptideshaker_archive" type="galaxy.datatypes.binary:CompressedArchive" subclass="true" display_in_upload="true"/>
     <!-- End Proteomics Datatypes -->
     <datatype extension="netcdf" type="galaxy.datatypes.binary:NetCDF" mimetype="application/octet-stream" display_in_upload="true" description="Format used by netCDF software library for writing and reading chromatography-MS data files." />
     <datatype extension="eps" type="galaxy.datatypes.images:Eps" mimetype="image/eps"/>
@@ -202,7 +214,7 @@
     <datatype extension="mafcustomtrack" type="galaxy.datatypes.sequence:MafCustomTrack">
       <display file="ucsc/maf_customtrack.xml" />
     </datatype>
-    <datatype extension="encodepeak" type="galaxy.datatypes.interval:ENCODEPeak" display_in_upload="True">
+    <datatype extension="encodepeak" type="galaxy.datatypes.interval:ENCODEPeak" display_in_upload="true">
       <converter file="encodepeak_to_tabix_converter.xml" target_datatype="tabix" depends_on="bgzip"/>
       <converter file="encodepeak_to_bgzip_converter.xml" target_datatype="bgzip"/>
       <converter file="bed_gff_or_vcf_to_bigwig_converter.xml" target_datatype="bigwig"/>
@@ -212,8 +224,8 @@
       <converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/>
       <converter file="interval_to_tabix_converter.xml" target_datatype="tabix" depends_on="bgzip"/>
     </datatype>
-    <datatype extension="obo" type="galaxy.datatypes.text:Obo" mimetype="text/html" display_in_upload="True" />
-    <datatype extension="owl" type="galaxy.datatypes.xml:Owl" mimetype="text/html" display_in_upload="True" />
+    <datatype extension="obo" type="galaxy.datatypes.text:Obo" mimetype="text/html" display_in_upload="true" />
+    <datatype extension="owl" type="galaxy.datatypes.xml:Owl" mimetype="text/html" display_in_upload="true" />
     <datatype extension="png" type="galaxy.datatypes.images:Png" mimetype="image/png"/>
     <datatype extension="qual" type="galaxy.datatypes.qualityscore:QualityScore" />
     <datatype extension="qualsolexa" type="galaxy.datatypes.qualityscore:QualityScoreSolexa" display_in_upload="true"/>
@@ -227,19 +239,19 @@
     </datatype>
     <datatype extension="scf" type="galaxy.datatypes.binary:Scf" mimetype="application/octet-stream" display_in_upload="true" description="A binary sequence file in 'scf' format with a '.scf' file extension.  You must manually select this 'File Format' when uploading the file." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Scf"/>
     <datatype extension="Sequences" type="galaxy.datatypes.assembly:Sequences" display_in_upload="false"/>
-    <datatype extension="snpeffdb" type="galaxy.datatypes.text:SnpEffDb" display_in_upload="True"/>
-    <datatype extension="snpsiftdbnsfp" type="galaxy.datatypes.text:SnpSiftDbNSFP" display_in_upload="True"/>
-    <datatype extension="dbnsfp.tabular" type="galaxy.datatypes.tabular:Tabular" subclass="True" display_in_upload="True">
+    <datatype extension="snpeffdb" type="galaxy.datatypes.text:SnpEffDb" display_in_upload="true"/>
+    <datatype extension="snpsiftdbnsfp" type="galaxy.datatypes.text:SnpSiftDbNSFP" display_in_upload="true"/>
+    <datatype extension="dbnsfp.tabular" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true">
         <converter file="tabular_to_dbnsfp.xml" target_datatype="snpsiftdbnsfp"/>
     </datatype>
     <datatype extension="sff" type="galaxy.datatypes.binary:Sff" mimetype="application/octet-stream" display_in_upload="true" description="A binary file in 'Standard Flowgram Format' with a '.sff' file extension." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Sff"/>
     <datatype extension="sra" type="galaxy.datatypes.binary:Sra" mimetype="application/octet-stream" display_in_upload="true" description="A binary file archive format from the NCBI Sequence Read Archive with a '.sra' file extension." description_url="http://www.ncbi.nlm.nih.gov/books/n/helpsra/SRA_Overview_BK/#SRA_Overview_BK.4_SRA_Data_Structure"/>
-    <datatype extension="svg" type="galaxy.datatypes.xml:GenericXml" mimetype="image/svg+xml" subclass="True"/>
+    <datatype extension="svg" type="galaxy.datatypes.xml:GenericXml" mimetype="image/svg+xml" subclass="true"/>
     <datatype extension="taxonomy" type="galaxy.datatypes.tabular:Taxonomy" display_in_upload="true"/>
     <datatype extension="tabular" type="galaxy.datatypes.tabular:Tabular" display_in_upload="true" description="Any data in tab delimited format (tabular)." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Tabular_.28tab_delimited.29"/>
     <datatype extension="twobit" type="galaxy.datatypes.binary:TwoBit" mimetype="application/octet-stream" display_in_upload="true"/>
     <datatype extension="sqlite" type="galaxy.datatypes.binary:SQlite" mimetype="application/octet-stream" display_in_upload="true"/>
-    <datatype extension="gemini.sqlite" type="galaxy.datatypes.binary:GeminiSQLite" mimetype="application/octet-stream" display_in_upload="True" />
+    <datatype extension="gemini.sqlite" type="galaxy.datatypes.binary:GeminiSQLite" mimetype="application/octet-stream" display_in_upload="true" />
     <datatype extension="txt" type="galaxy.datatypes.data:Text" display_in_upload="true" description="Any text file." description_url="https://wiki.galaxyproject.org/Learn/Datatypes#Plain_text"/>
     <datatype extension="linecount" type="galaxy.datatypes.data:LineCount" display_in_upload="false"/>
     <datatype extension="memexml" type="galaxy.datatypes.xml:MEMEXml" mimetype="application/xml" display_in_upload="true"/>
@@ -252,13 +264,13 @@
       <converter file="bed_gff_or_vcf_to_bigwig_converter.xml" target_datatype="bigwig"/>
       <display file="ucsc/vcf.xml" />
       <display file="igv/vcf.xml" />
-      <display file="rviewer/vcf.xml" inherit="True"/>
+      <display file="rviewer/vcf.xml" inherit="true"/>
       <display file="iobio/vcf.xml" />
     </datatype>
-    <datatype extension="bcf" type="galaxy.datatypes.binary:Bcf" mimetype="application/octet-stream" display_in_upload="True">
+    <datatype extension="bcf" type="galaxy.datatypes.binary:Bcf" mimetype="application/octet-stream" display_in_upload="true">
       <converter file="bcf_to_bcf_bgzip_converter.xml" target_datatype="bcf_bgzip"/>
     </datatype>
-    <datatype extension="bcf_bgzip" type="galaxy.datatypes.binary:Binary" mimetype="application/octet-stream" subclass="True">
+    <datatype extension="bcf_bgzip" type="galaxy.datatypes.binary:Binary" mimetype="application/octet-stream" subclass="true">
       <converter file="bcf_bgzip_to_bcf_converter.xml" target_datatype="bcf"/>
     </datatype>
     <datatype extension="velvet" type="galaxy.datatypes.assembly:Velvet" display_in_upload="false"/>
@@ -268,10 +280,10 @@
       <!-- <display file="gbrowse/gbrowse_wig.xml" /> -->
       <display file="igb/wig.xml" />
     </datatype>
-    <datatype extension="interval_index" type="galaxy.datatypes.binary:Binary" subclass="True" />
-    <datatype extension="tabix" type="galaxy.datatypes.binary:Binary" subclass="True" />
-    <datatype extension="bgzip" type="galaxy.datatypes.binary:Binary" subclass="True" />
-    <datatype extension="vcf_bgzip" type_extension="bgzip" subclass="True" >
+    <datatype extension="interval_index" type="galaxy.datatypes.binary:Binary" subclass="true" />
+    <datatype extension="tabix" type="galaxy.datatypes.binary:Binary" subclass="true" />
+    <datatype extension="bgzip" type="galaxy.datatypes.binary:Binary" subclass="true" />
+    <datatype extension="vcf_bgzip" type_extension="bgzip" subclass="true" >
       <display file="igv/vcf.xml" />
       <converter file="vcf_bgzip_to_tabix_converter.xml" target_datatype="tabix"/>
     </datatype>
@@ -316,8 +328,8 @@
     <datatype extension="snpmatrix" type="galaxy.datatypes.genetics:SNPMatrix" display_in_upload="true"/>
     <datatype extension="xls" type="galaxy.datatypes.tabular:Tabular"/>
     <!-- End RGenetics Datatypes -->
-    <datatype extension="ipynb" type="galaxy.datatypes.text:Ipynb" display_in_upload="True" />
-    <datatype extension="json" type="galaxy.datatypes.text:Json" display_in_upload="True" />
+    <datatype extension="ipynb" type="galaxy.datatypes.text:Ipynb" display_in_upload="true" />
+    <datatype extension="json" type="galaxy.datatypes.text:Json" display_in_upload="true" />
     <!-- graph datatypes -->
     <datatype extension="xgmml" type="galaxy.datatypes.graph:Xgmml" display_in_upload="true"/>
     <datatype extension="sif" type="galaxy.datatypes.graph:Sif" display_in_upload="true"/>
@@ -331,108 +343,108 @@
     <datatype extension="jsonld" type="galaxy.datatypes.triples:Jsonld" display_in_upload="true"/>
     <!-- Excel datatypes -->
     <datatype extension="xlsx" type="galaxy.datatypes.binary:Xlsx" display_in_upload="true" />
-    <datatype extension="btwisted" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="cai" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="charge" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="checktrans" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="chips" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="codcmp" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="coderet" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="compseq" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="cpgplot" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="cpgreport" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="cusp" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="cut" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="dan" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="digest" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="dreg" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="einverted" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="epestfind" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="equicktandem" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="est2genome" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="etandem" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="freak" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="fuzznuc" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="fuzzpro" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="fuzztran" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="garnier" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="geecee" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="helixturnhelix" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="hmoment" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="isochore" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="match" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="nametable" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="needle" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="newcpgreport" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="newcpgseek" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="noreturn" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="palindrome" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="pepcoil" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="pepinfo" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="pepstats" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="polydot" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="preg" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="prettyseq" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="primersearch" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="showfeat" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="showorf" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="sixpack" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="strider" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="supermatcher" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="syco" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="textsearch" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="vectorstrip" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="wobble" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="wordcount" type="galaxy.datatypes.data:Text" subclass="True"/>
+    <datatype extension="btwisted" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="cai" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="charge" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="checktrans" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="chips" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="codcmp" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="coderet" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="compseq" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="cpgplot" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="cpgreport" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="cusp" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="cut" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="dan" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="digest" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="dreg" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="einverted" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="epestfind" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="equicktandem" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="est2genome" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="etandem" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="freak" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="fuzznuc" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="fuzzpro" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="fuzztran" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="garnier" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="geecee" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="helixturnhelix" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="hmoment" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="isochore" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="match" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="nametable" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="needle" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="newcpgreport" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="newcpgseek" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="noreturn" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="palindrome" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="pepcoil" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="pepinfo" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="pepstats" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="polydot" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="preg" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="prettyseq" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="primersearch" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="showfeat" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="showorf" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="sixpack" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="strider" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="supermatcher" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="syco" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="textsearch" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="vectorstrip" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="wobble" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="wordcount" type="galaxy.datatypes.data:Text" subclass="true"/>
     <!-- Report formats http://emboss.sourceforge.net/docs/themes/ReportFormats.html -->
-    <datatype extension="dbmotif" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="diffseq" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="excel" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="feattable" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="motif" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="regions" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="seqtable" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="simple" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="table" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="tagseq" type="galaxy.datatypes.data:Text" subclass="True"/>
+    <datatype extension="dbmotif" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="diffseq" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="excel" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="feattable" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="motif" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="regions" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="seqtable" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="simple" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="table" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="tagseq" type="galaxy.datatypes.data:Text" subclass="true"/>
     <!-- Sequence formats http://emboss.sourceforge.net/docs/themes/SequenceFormats.html -->
-    <datatype extension="acedb" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="clustal" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="codata" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="embl" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="fitch" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="gcg" type="galaxy.datatypes.data:Text" subclass="True"/>
+    <datatype extension="acedb" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="clustal" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="codata" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="embl" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="fitch" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="gcg" type="galaxy.datatypes.data:Text" subclass="true"/>
     <datatype extension="genbank" type="galaxy.datatypes.sequence:Genbank" edam_format="format_1936"/>
-    <datatype extension="hennig86" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="ig" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="jackknifer" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="jackknifernon" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="mega" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="meganon" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="ncbi" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="nexus" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="nexusnon" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="phylip" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="phylipnon" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="pir" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="staden" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="swiss" type="galaxy.datatypes.data:Text" subclass="True"/>
+    <datatype extension="hennig86" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="ig" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="jackknifer" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="jackknifernon" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="mega" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="meganon" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="ncbi" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="nexus" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="nexusnon" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="phylip" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="phylipnon" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="pir" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="staden" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="swiss" type="galaxy.datatypes.data:Text" subclass="true"/>
     <!-- Alignment Formats http://emboss.sourceforge.net/docs/themes/AlignFormats.html -->
-    <datatype extension="markx0" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="markx1" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="markx10" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="markx2" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="markx3" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="pair" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="score" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="srs" type="galaxy.datatypes.data:Text" subclass="True"/>
-    <datatype extension="srspair" type="galaxy.datatypes.data:Text" subclass="True"/>
+    <datatype extension="markx0" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="markx1" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="markx10" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="markx2" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="markx3" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="pair" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="score" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="srs" type="galaxy.datatypes.data:Text" subclass="true"/>
+    <datatype extension="srspair" type="galaxy.datatypes.data:Text" subclass="true"/>
     <!-- MSA Datatypes -->
     <datatype extension="hmm2" type="galaxy.datatypes.msa:Hmmer2" display_in_upload="true" />
     <datatype extension="hmm3" type="galaxy.datatypes.msa:Hmmer3" display_in_upload="true" />
-    <datatype extension="stockholm" type="galaxy.datatypes.msa:Stockholm_1_0" display_in_upload="True" />
-    <datatype extension="xmfa" type="galaxy.datatypes.msa:MauveXmfa" display_in_upload="True" />
-    <datatype extension="cel" type="galaxy.datatypes.binary:Cel" display_in_upload="True" />
+    <datatype extension="stockholm" type="galaxy.datatypes.msa:Stockholm_1_0" display_in_upload="true" />
+    <datatype extension="xmfa" type="galaxy.datatypes.msa:MauveXmfa" display_in_upload="true" />
+    <datatype extension="cel" type="galaxy.datatypes.binary:Cel" display_in_upload="true" />
 
     <datatype extension="RData" type="galaxy.datatypes.binary:RData" display_in_upload="true" description="Stored data from an R session"/>
     <datatype extension="oxlicg" type="galaxy.datatypes.binary:OxliCountGraph" mimetype="application/octet-stream" display_in_upload="true"/>
@@ -447,14 +459,14 @@
     <datatype extension="vtkascii" type="galaxy.datatypes.constructive_solid_geometry:VtkAscii" display_in_upload="true" />
     <datatype extension="vtkbinary" type="galaxy.datatypes.constructive_solid_geometry:VtkBinary" display_in_upload="true" />
     <!-- Metagenomic Datatype -->
-    <datatype extension="biom1" type="galaxy.datatypes.text:Biom1" display_in_upload="True" subclass="True" mimetype="application/json">
+    <datatype extension="biom1" type="galaxy.datatypes.text:Biom1" display_in_upload="true" subclass="true" mimetype="application/json">
         <display file="biom/biom_simple.xml" />
     </datatype>
     <!-- Strand-specific Coordinate Count Datatype used by the Center for Eukaryotic Gene Regulation labs at Penn State -->
     <datatype extension="scidx" type="galaxy.datatypes.interval:ScIdx" display_in_upload="true" />
 
     <!--Cheminformatics Datatypes -->
-    <datatype extension="smi" type="galaxy.datatypes.molecules:SMILES" display_in_upload="True">
+    <datatype extension="smi" type="galaxy.datatypes.molecules:SMILES" display_in_upload="true">
         <!-- The ordering is important. The first one is considered as default converter in the build-in conversion function -> (as sdf)-->
         <converter file="smi_to_sdf_converter.xml" target_datatype="sdf"/>
         <converter file="smi_to_inchi_converter.xml" target_datatype="inchi"/>
@@ -463,79 +475,79 @@
         <converter file="smi_to_mol2_converter.xml" target_datatype="mol2"/>
         <converter file="smi_to_smi_converter.xml" target_datatype="smi"/>
     </datatype>
-    <datatype extension="sdf" type="galaxy.datatypes.molecules:SDF" display_in_upload="True">
+    <datatype extension="sdf" type="galaxy.datatypes.molecules:SDF" display_in_upload="true">
         <converter file="sdf_to_smi_converter.xml" target_datatype="smi"/>
         <converter file="sdf_to_inchi_converter.xml" target_datatype="inchi"/>
         <converter file="sdf_to_mol2_converter.xml" target_datatype="mol2"/>
         <converter file="sdf_to_cml_converter.xml" target_datatype="cml"/>
     </datatype>
-    <datatype extension="inchi" type="galaxy.datatypes.molecules:InChI" display_in_upload="True">
+    <datatype extension="inchi" type="galaxy.datatypes.molecules:InChI" display_in_upload="true">
         <converter file="inchi_to_smi_converter.xml" target_datatype="smi"/>
         <converter file="inchi_to_sdf_converter.xml" target_datatype="sdf"/>
         <converter file="inchi_to_mol_converter.xml" target_datatype="mol"/>
         <converter file="inchi_to_mol2_converter.xml" target_datatype="mol2"/>
         <converter file="inchi_to_cml_converter.xml" target_datatype="cml"/>
     </datatype>
-    <datatype extension="mol" type="galaxy.datatypes.molecules:MOL" display_in_upload="True">
+    <datatype extension="mol" type="galaxy.datatypes.molecules:MOL" display_in_upload="true">
         <converter file="mol_to_smi_converter.xml" target_datatype="smi"/>
         <converter file="mol_to_inchi_converter.xml" target_datatype="inchi"/>
         <converter file="mol_to_mol2_converter.xml" target_datatype="mol2"/>
         <converter file="mol_to_cml_converter.xml" target_datatype="cml"/>
     </datatype>
-    <datatype extension="mol2" type="galaxy.datatypes.molecules:MOL2" display_in_upload="False">
+    <datatype extension="mol2" type="galaxy.datatypes.molecules:MOL2" display_in_upload="false">
         <converter file="mol2_to_smi_converter.xml" target_datatype="smi"/>
         <converter file="mol2_to_sdf_converter.xml" target_datatype="sdf"/>
         <converter file="mol2_to_inchi_converter.xml" target_datatype="inchi"/>
         <converter file="mol2_to_mol_converter.xml" target_datatype="mol"/>
         <converter file="mol2_to_cml_converter.xml" target_datatype="cml"/>
     </datatype>
-    <datatype extension="cml" type="galaxy.datatypes.molecules:CML" display_in_upload="True">
+    <datatype extension="cml" type="galaxy.datatypes.molecules:CML" display_in_upload="true">
         <converter file="cml_to_smi_converter.xml" target_datatype="smi"/>
         <converter file="cml_to_inchi_converter.xml" target_datatype="inchi"/>
         <converter file="cml_to_sdf_converter.xml" target_datatype="sdf"/>
         <converter file="cml_to_mol2_converter.xml" target_datatype="mol2"/>
         </datatype>
-    <datatype extension="fps" type="galaxy.datatypes.molecules:FPS" mimetype="text/html" display_in_upload="True" />
-    <datatype extension="obfs" type="galaxy.datatypes.molecules:OBFS" mimetype="text/html" display_in_upload="True" />
-    <datatype extension="phar" type="galaxy.datatypes.molecules:PHAR" display_in_upload="False" />
-    <datatype extension="pdb" type="galaxy.datatypes.molecules:PDB" display_in_upload="True" />
+    <datatype extension="fps" type="galaxy.datatypes.molecules:FPS" mimetype="text/html" display_in_upload="true" />
+    <datatype extension="obfs" type="galaxy.datatypes.molecules:OBFS" mimetype="text/html" display_in_upload="true" />
+    <datatype extension="phar" type="galaxy.datatypes.molecules:PHAR" display_in_upload="false" />
+    <datatype extension="pdb" type="galaxy.datatypes.molecules:PDB" display_in_upload="true" />
     <!-- mothur formats -->
     <datatype extension="mothur.otu" type="galaxy.datatypes.mothur:Otu" display_in_upload="true"/>
-    <datatype extension="mothur.list" type="galaxy.datatypes.mothur:Otu" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.list" type="galaxy.datatypes.mothur:Otu" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.sabund" type="galaxy.datatypes.mothur:Sabund" display_in_upload="true"/>
-    <datatype extension="mothur.rabund" type="galaxy.datatypes.mothur:Sabund" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.rabund" type="galaxy.datatypes.mothur:Sabund" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.shared" type="galaxy.datatypes.mothur:GroupAbund" display_in_upload="true"/>
-    <datatype extension="mothur.relabund" type="galaxy.datatypes.mothur:GroupAbund" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.relabund" type="galaxy.datatypes.mothur:GroupAbund" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.names" type="galaxy.datatypes.mothur:Names" display_in_upload="true"/>
-    <datatype extension="mothur.design" type="galaxy.datatypes.mothur:Group" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.design" type="galaxy.datatypes.mothur:Group" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.summary" type="galaxy.datatypes.mothur:Summary" display_in_upload="true"/>
     <datatype extension="mothur.groups" type="galaxy.datatypes.mothur:Group" display_in_upload="true"/>
     <datatype extension="mothur.oligos" type="galaxy.datatypes.mothur:Oligos" display_in_upload="true"/>
-    <datatype extension="mothur.align" type="galaxy.datatypes.sequence:Fasta" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.align" type="galaxy.datatypes.sequence:Fasta" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.accnos" type="galaxy.datatypes.mothur:AccNos" display_in_upload="true"/>
     <datatype extension="mothur.otulabels" type="galaxy.datatypes.mothur:AccNos" display_in_upload="true"/>
-    <datatype extension="mothur.otu.corr" type="galaxy.datatypes.tabular:Tabular" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.otu.corr" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.map" type="galaxy.datatypes.mothur:SecondaryStructureMap" display_in_upload="true"/>
     <datatype extension="mothur.align.check" type="galaxy.datatypes.mothur:AlignCheck" display_in_upload="true"/>
     <datatype extension="mothur.align.report" type="galaxy.datatypes.mothur:AlignReport" display_in_upload="true"/>
     <datatype extension="mothur.filter" type="galaxy.datatypes.mothur:LaneMask" display_in_upload="true"/>
     <datatype extension="mothur.dist" type="galaxy.datatypes.mothur:DistanceMatrix" display_in_upload="true"/>
-    <datatype extension="mothur.tre" type="galaxy.datatypes.data:Text" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.tre" type="galaxy.datatypes.data:Text" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.pair.dist" type="galaxy.datatypes.mothur:PairwiseDistanceMatrix" display_in_upload="true"/>
     <datatype extension="mothur.square.dist" type="galaxy.datatypes.mothur:SquareDistanceMatrix" display_in_upload="true"/>
     <datatype extension="mothur.lower.dist" type="galaxy.datatypes.mothur:LowerTriangleDistanceMatrix" display_in_upload="true"/>
     <datatype extension="mothur.ref.taxonomy" type="galaxy.datatypes.mothur:RefTaxonomy" display_in_upload="true">
       <converter file="ref_to_seq_taxonomy_converter.xml" target_datatype="mothur.seq.taxonomy"/>
     </datatype>
-    <datatype extension="mothur.seq.taxonomy" type="galaxy.datatypes.mothur:RefTaxonomy" subclass="True" display_in_upload="true"/>
-    <datatype extension="mothur.rdp.taxonomy" type="galaxy.datatypes.mothur:RefTaxonomy" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.seq.taxonomy" type="galaxy.datatypes.mothur:RefTaxonomy" subclass="true" display_in_upload="true"/>
+    <datatype extension="mothur.rdp.taxonomy" type="galaxy.datatypes.mothur:RefTaxonomy" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.cons.taxonomy" type="galaxy.datatypes.mothur:ConsensusTaxonomy" display_in_upload="true"/>
     <datatype extension="mothur.tax.summary" type="galaxy.datatypes.mothur:TaxonomySummary" display_in_upload="true"/>
     <datatype extension="mothur.freq" type="galaxy.datatypes.mothur:Frequency" display_in_upload="true"/>
     <datatype extension="mothur.quan" type="galaxy.datatypes.mothur:Quantile" display_in_upload="true"/>
-    <datatype extension="mothur.filtered.quan" type="galaxy.datatypes.mothur:Quantile" subclass="True" display_in_upload="true"/>
-    <datatype extension="mothur.masked.quan" type="galaxy.datatypes.mothur:Quantile" subclass="True" display_in_upload="true"/>
-    <datatype extension="mothur.filtered.masked.quan" type="galaxy.datatypes.mothur:Quantile" subclass="True" display_in_upload="true"/>
+    <datatype extension="mothur.filtered.quan" type="galaxy.datatypes.mothur:Quantile" subclass="true" display_in_upload="true"/>
+    <datatype extension="mothur.masked.quan" type="galaxy.datatypes.mothur:Quantile" subclass="true" display_in_upload="true"/>
+    <datatype extension="mothur.filtered.masked.quan" type="galaxy.datatypes.mothur:Quantile" subclass="true" display_in_upload="true"/>
     <datatype extension="mothur.axes" type="galaxy.datatypes.mothur:Axes" display_in_upload="true"/>
     <datatype extension="mothur.sff.flow" type="galaxy.datatypes.mothur:SffFlow" display_in_upload="true"/>
     <datatype extension="mothur.count_table" type="galaxy.datatypes.mothur:CountTable" display_in_upload="true"/>
@@ -547,9 +559,9 @@
     <datatype extension="blastdbn" type="galaxy.datatypes.blast:BlastNucDb" mimetype="text/html" display_in_upload="false"/>
     <datatype extension="blastdbp" type="galaxy.datatypes.blast:BlastProtDb" mimetype="text/html" display_in_upload="false"/>
     <datatype extension="blastdbd" type="galaxy.datatypes.blast:BlastDomainDb" mimetype="text/html" display_in_upload="false"/>
-    <datatype extension="maskinfo-asn1" type="galaxy.datatypes.data:GenericAsn1" mimetype="text/plain" subclass="True" display_in_upload="true" />
-    <datatype extension="maskinfo-asn1-binary" type="galaxy.datatypes.binary:GenericAsn1Binary" mimetype="application/octet-stream" subclass="True" display_in_upload="true" />
-    <datatype extension="pssm-asn1" type="galaxy.datatypes.data:GenericAsn1" mimetype="text/plain" subclass="True" display_in_upload="true" />
+    <datatype extension="maskinfo-asn1" type="galaxy.datatypes.data:GenericAsn1" mimetype="text/plain" subclass="true" display_in_upload="true" />
+    <datatype extension="maskinfo-asn1-binary" type="galaxy.datatypes.binary:GenericAsn1Binary" mimetype="application/octet-stream" subclass="true" display_in_upload="true" />
+    <datatype extension="pssm-asn1" type="galaxy.datatypes.data:GenericAsn1" mimetype="text/plain" subclass="true" display_in_upload="true" />
     <!-- PlantTribes datatypes -->
     <datatype extension="smat" type="galaxy.datatypes.estscan:Smat" display_in_upload="true" />
   </registration>
diff --git a/lib/galaxy/datatypes/images.py b/lib/galaxy/datatypes/images.py
index d9e04cc8053..53b61df5648 100644
--- a/lib/galaxy/datatypes/images.py
+++ b/lib/galaxy/datatypes/images.py
@@ -68,6 +68,18 @@ class Tiff( Image ):
     file_ext = "tiff"
 
 
+class Hamamatsu( Image ):
+    file_ext = "vms"
+
+
+class Mirax( Image ):
+    file_ext = "mrxs"
+
+
+class Sakura( Image ):
+    file_ext = "svslide"
+
+
 class Bmp( Image ):
     edam_format = "format_3592"
     file_ext = "bmp"