diff --git a/browser/src/GenePage/GenePage.tsx b/browser/src/GenePage/GenePage.tsx
index e686aaecc..f93a8712b 100644
--- a/browser/src/GenePage/GenePage.tsx
+++ b/browser/src/GenePage/GenePage.tsx
@@ -22,7 +22,6 @@ import {
   isExac,
   hasCopyNumberVariants,
   isV2,
-  getTopLevelDataset,
 } from '@gnomad/dataset-metadata/metadata'
 import ConstraintTable from '../ConstraintTable/ConstraintTable'
 import VariantCooccurrenceCountsTable, {
@@ -73,7 +72,6 @@ import {
 } from '../ChartStyles'
 import { logButtonClick } from '../analytics'
 import { GtexTissueExpression } from './TranscriptsTissueExpression'
-import { GTEX_TISSUES } from '../gtex'
 
 export type Strand = '+' | '-'
 
@@ -527,7 +525,6 @@ const GenePage = ({ datasetId, gene, geneId }: Props) => {
             <GeneTranscriptsTrack
               datasetId={datasetId}
               isTissueExpressionAvailable={!!gene.pext}
-              gtexTissues={GTEX_TISSUES[getTopLevelDataset(datasetId)]}
               gene={gene}
               includeNonCodingTranscripts={includeNonCodingTranscripts}
               includeUTRs={includeUTRs}
@@ -539,12 +536,10 @@ const GenePage = ({ datasetId, gene, geneId }: Props) => {
 
         {hasCodingExons && gene.chrom !== 'M' && gene.pext && (
           <TissueExpressionTrack
-            gtexTissues={GTEX_TISSUES[getTopLevelDataset(datasetId)]}
             exons={cdsCompositeExons}
             expressionRegions={gene.pext.regions}
             flags={gene.pext.flags}
-            // if a gene has pext, it also has GTEx
-            transcripts={gene.transcripts as TranscriptWithTissueExpression[]} // if a gene has pext,
+            transcripts={gene.transcripts as TranscriptWithTissueExpression[]} // if a gene has pext, it has gtex
             preferredTranscriptId={preferredTranscriptId}
             preferredTranscriptDescription={preferredTranscriptDescription}
           />
diff --git a/browser/src/GenePage/GeneTranscriptsTrack.tsx b/browser/src/GenePage/GeneTranscriptsTrack.tsx
index 0116273d2..ef75a616f 100644
--- a/browser/src/GenePage/GeneTranscriptsTrack.tsx
+++ b/browser/src/GenePage/GeneTranscriptsTrack.tsx
@@ -8,14 +8,14 @@ import { Track } from '@gnomad/region-viewer'
 import TranscriptsTrack from '@gnomad/track-transcripts'
 import { Button, Modal, TooltipAnchor } from '@gnomad/ui'
 
-import { AllGtexTissues, TissueDetail } from '../gtex'
+import { ALL_GTEX_TISSUES, GtexTissueName } from '../gtex'
 import InfoButton from '../help/InfoButton'
 import Link from '../Link'
 import sortedTranscripts from './sortedTranscripts'
 import TranscriptsTissueExpression from './TranscriptsTissueExpression'
 import { Gene } from './GenePage'
 import { DatasetId, hasStructuralVariants } from '../../../dataset-metadata/metadata'
-import { TranscriptWithTissueExpression } from './TissueExpressionTrack'
+import { GtexTissueDetail, TranscriptWithTissueExpression } from './TissueExpressionTrack'
 
 const TranscriptsInfoWrapper = styled.div`
   display: flex;
@@ -38,7 +38,6 @@ const RightPanel = styled.div`
 type GeneTranscriptsTrack = {
   datasetId: DatasetId
   isTissueExpressionAvailable: boolean
-  gtexTissues: Partial<AllGtexTissues> & { [key: string]: TissueDetail | undefined }
   gene: Gene
   includeNonCodingTranscripts: boolean
   includeUTRs: boolean
@@ -49,7 +48,6 @@ type GeneTranscriptsTrack = {
 const GeneTranscriptsTrack = ({
   datasetId,
   isTissueExpressionAvailable,
-  gtexTissues,
   gene,
   includeNonCodingTranscripts,
   includeUTRs,
@@ -59,6 +57,20 @@ const GeneTranscriptsTrack = ({
   const transcriptsTrack = useRef(null)
   const [showTissueExpressionModal, setShowTissueExpressionModal] = useState(false)
 
+  const gtexTissues: Partial<Record<GtexTissueName, GtexTissueDetail>> = {}
+  if (isTissueExpressionAvailable) {
+    const preferredTranscript = (gene.transcripts as TranscriptWithTissueExpression[]).find(
+      (transcript) => transcript.transcript_id === preferredTranscriptId
+    )
+    preferredTranscript!.gtex_tissue_expression.forEach((tissue) => {
+      gtexTissues[tissue.tissue as GtexTissueName] = {
+        fullName: ALL_GTEX_TISSUES[tissue.tissue as GtexTissueName].fullName || tissue.tissue,
+        color: ALL_GTEX_TISSUES[tissue.tissue as GtexTissueName].color || '#888888',
+        value: tissue.value,
+      }
+    })
+  }
+
   const maxMeanExpression = isTissueExpressionAvailable
     ? max(
         (gene.transcripts as TranscriptWithTissueExpression[]).map(
@@ -167,7 +179,7 @@ const GeneTranscriptsTrack = ({
                       tooltip={`Mean expression across all tissues = ${meanExpression.toFixed(
                         2
                       )} TPM\nMost expressed in ${
-                        gtexTissues[tissueMostExpressedIn]!.fullName
+                        gtexTissues[tissueMostExpressedIn as GtexTissueName]!.fullName
                       } (${maxExpression.toFixed(2)} TPM)`}
                     >
                       <rect
diff --git a/browser/src/GenePage/TissueExpressionTrack.tsx b/browser/src/GenePage/TissueExpressionTrack.tsx
index 09af63f25..6c3e8741f 100644
--- a/browser/src/GenePage/TissueExpressionTrack.tsx
+++ b/browser/src/GenePage/TissueExpressionTrack.tsx
@@ -9,7 +9,7 @@ import { Track } from '@gnomad/region-viewer'
 import { RegionsPlot } from '@gnomad/track-regions'
 import { Badge, Button, Modal, SearchInput, Select, TooltipAnchor } from '@gnomad/ui'
 
-import { AllGtexTissues } from '../gtex'
+import { ALL_GTEX_TISSUES, GtexTissueName, GtexTissues } from '../gtex'
 import InfoButton from '../help/InfoButton'
 
 import { logButtonClick } from '../analytics'
@@ -68,8 +68,7 @@ const TRACK_HEIGHT = 20
 const heightScale = scaleLinear().domain([0, 1]).range([0, TRACK_HEIGHT]).clamp(true)
 
 type PextRegionsPlotProps = {
-  // datasetId: DatasetId
-  gtexTissues: Partial<AllGtexTissues>
+  gtexTissues: Partial<GtexTissues>
   color: string
   regions: {
     start: number
@@ -154,8 +153,7 @@ type ExpressedTissue = {
 }
 
 type IndividualTissueTrackProps = {
-  // datasetId: DatasetId
-  gtexTissues: Partial<AllGtexTissues>
+  gtexTissues: Partial<GtexTissues>
   exons: {
     start: number
     stop: number
@@ -169,7 +167,7 @@ type IndividualTissueTrackProps = {
   maxTranscriptExpressionInTissue: number
   maxMeanTranscriptExpressionInAnyTissue: number
   meanTranscriptExpressionInTissue: number
-  tissue: string
+  tissue: GtexTissueName
   transcriptWithMaxExpressionInTissue: {
     transcript_id: string
     transcript_version: string
@@ -189,13 +187,13 @@ const IndividualTissueTrack = ({
   const isExpressed = expressionRegions.some(
     (region: any) =>
       region.tissues.find((tissueObject: ExpressedTissue) => tissueObject.tissue === tissue)
-        .value !== 0
+        ?.value !== 0
   )
 
   return (
     <Track
       // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-      renderLeftPanel={() => <TissueName>{gtexTissuesForDataset[tissue].fullName}</TissueName>}
+      renderLeftPanel={() => <TissueName>{gtexTissues[tissue].fullName}</TissueName>}
       renderRightPanel={({ width }: any) =>
         width > 36 && (
           <svg width={width} height={31}>
@@ -223,8 +221,7 @@ const IndividualTissueTrack = ({
                     )} (${transcriptWithMaxExpressionInTissue!.transcript_id}.${
                       transcriptWithMaxExpressionInTissue!.transcript_version
                     })`
-                  : // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-                    `Gene is not expressed in ${gtexTissuesForDataset[tissue].fullName}`
+                  : `Gene is not expressed in ${gtexTissues[tissue]!.fullName}`
               }
             >
               <rect x={12} y={2} width={25} height={27} fill="none" pointerEvents="visible" />
@@ -258,13 +255,12 @@ const IndividualTissueTrack = ({
           <PlotWrapper key={tissue}>
             <PextRegionsPlot
               gtexTissues={gtexTissues}
-              // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-              color={gtexTissues[tissue].color}
+              color={gtexTissues[tissue]!.color}
               regions={getPlotRegions(
                 expressionRegions,
                 (r: any) =>
                   r.tissues.find((tissueObject: ExpressedTissue) => tissueObject.tissue === tissue)
-                    .value
+                    ?.value || 0
               )}
               scalePosition={scalePosition}
               width={width}
@@ -330,7 +326,6 @@ export type TranscriptWithTissueExpression = Omit<GeneTranscript, 'gtex_tissue_e
 }
 
 type TissueExpressionTrackProps = {
-  gtexTissues: Partial<AllGtexTissues>
   exons: {
     start: number
     stop: number
@@ -350,8 +345,13 @@ type TissueExpressionTrackProps = {
   preferredTranscriptDescription?: string | React.ReactNode
 }
 
+export type GtexTissueDetail = {
+  fullName: string
+  color: string
+  value: number
+}
+
 const TissueExpressionTrack = ({
-  gtexTissues,
   exons,
   expressionRegions,
   flags,
@@ -368,6 +368,17 @@ const TissueExpressionTrack = ({
     'alphabetical'
   )
 
+  const gtexTissues: Partial<Record<GtexTissueName, GtexTissueDetail>> = {}
+  transcripts
+    .find((transcript) => transcript.transcript_id === preferredTranscriptId)
+    ?.gtex_tissue_expression.forEach((tissue) => {
+      gtexTissues[tissue.tissue as GtexTissueName] = {
+        fullName: ALL_GTEX_TISSUES[tissue.tissue as GtexTissueName].fullName || tissue.tissue,
+        color: ALL_GTEX_TISSUES[tissue.tissue as GtexTissueName].color || '#888888',
+        value: tissue.value,
+      }
+    })
+
   type ExpressionByTissueDetails = {
     maxTranscriptExpressionInTissue: number
     meanTranscriptExpressionInTissue: number
@@ -386,10 +397,10 @@ const TissueExpressionTrack = ({
       transcripts.forEach((transcript) => {
         const expressionInTissue = transcript.gtex_tissue_expression.find(
           (tissue) => tissue.tissue === tissueId
-        )!.value
+        )
 
-        if (expressionInTissue > maxTranscriptExpressionInTissue) {
-          maxTranscriptExpressionInTissue = expressionInTissue!
+        if (expressionInTissue && expressionInTissue.value > maxTranscriptExpressionInTissue) {
+          maxTranscriptExpressionInTissue = expressionInTissue.value
           transcriptWithMaxExpressionInTissue = {
             transcript_id: transcript.transcript_id,
             transcript_version: transcript.transcript_version,
@@ -398,10 +409,12 @@ const TissueExpressionTrack = ({
       })
 
       const meanTranscriptExpressionInTissue = mean(
-        transcripts.map(
-          (transcript) =>
-            transcript.gtex_tissue_expression.find((tissue) => tissue.tissue === tissueId)!.value
-        )
+        transcripts
+          .map(
+            (transcript) =>
+              transcript.gtex_tissue_expression.find((tissue) => tissue.tissue === tissueId)?.value
+          )
+          .filter((value): value is number => value !== undefined)
       )
 
       return {
@@ -420,23 +433,27 @@ const TissueExpressionTrack = ({
     Object.values(expressionByTissue).map((v) => v.meanTranscriptExpressionInTissue)
   )!
 
-  let tissues
-  if (sortTissuesBy === 'mean-expression') {
-    tissues = Object.entries(gtexTissues)
-      .sort((t1, t2) => {
-        const t1Expression = expressionByTissue[t1[0]].meanTranscriptExpressionInTissue
-        const t2Expression = expressionByTissue[t2[0]].meanTranscriptExpressionInTissue
-        if (t1Expression === t2Expression) {
-          return t1[1].fullName.localeCompare(t2[1].fullName)
-        }
-        return t2Expression - t1Expression
-      })
-      .map((t: any) => t[0])
-  } else {
-    tissues = Object.entries(gtexTissues)
-      .sort((t1, t2) => t1[1].fullName.localeCompare(t2[1].fullName))
-      .map((t) => t[0])
-  }
+  const tissues =
+    sortTissuesBy === 'mean-expression'
+      ? Object.entries(gtexTissues)
+          .sort((t1, t2) => {
+            const t1Expression = expressionByTissue[t1[0]].meanTranscriptExpressionInTissue
+            const t2Expression = expressionByTissue[t2[0]].meanTranscriptExpressionInTissue
+            if (t1Expression === t2Expression) {
+              return ALL_GTEX_TISSUES[t1[0] as GtexTissueName].fullName.localeCompare(
+                ALL_GTEX_TISSUES[t2[0] as GtexTissueName].fullName
+              )
+            }
+            return t2Expression - t1Expression
+          })
+          .map((t: any) => t[0])
+      : Object.entries(gtexTissues)
+          .sort((t1, t2) =>
+            ALL_GTEX_TISSUES[t1[0] as GtexTissueName].fullName.localeCompare(
+              ALL_GTEX_TISSUES[t2[0] as GtexTissueName].fullName
+            )
+          )
+          .map((t) => t[0])
 
   const isExpressed = expressionRegions.some((region: any) => region.mean !== 0)
 
@@ -579,25 +596,27 @@ const TissueExpressionTrack = ({
               }}
             </Track>
             {(tissueFilterText ? tissues.filter(tissuePredicate(tissueFilterText)) : tissues).map(
-              (tissue: any) => (
-                <IndividualTissueTrack
-                  gtexTissues={gtexTissues}
-                  key={tissue}
-                  exons={exons}
-                  expressionRegions={expressionRegions}
-                  maxTranscriptExpressionInTissue={
-                    expressionByTissue[tissue].maxTranscriptExpressionInTissue
-                  }
-                  maxMeanTranscriptExpressionInAnyTissue={maxMeanTranscriptExpressionInAnyTissue}
-                  meanTranscriptExpressionInTissue={
-                    expressionByTissue[tissue].meanTranscriptExpressionInTissue
-                  }
-                  transcriptWithMaxExpressionInTissue={
-                    expressionByTissue[tissue].transcriptWithMaxExpressionInTissue
-                  }
-                  tissue={tissue}
-                />
-              )
+              (tissue: any) => {
+                return (
+                  <IndividualTissueTrack
+                    gtexTissues={gtexTissues}
+                    key={`${tissue}`}
+                    exons={exons}
+                    expressionRegions={expressionRegions}
+                    maxTranscriptExpressionInTissue={
+                      expressionByTissue[tissue].maxTranscriptExpressionInTissue
+                    }
+                    maxMeanTranscriptExpressionInAnyTissue={maxMeanTranscriptExpressionInAnyTissue}
+                    meanTranscriptExpressionInTissue={
+                      expressionByTissue[tissue].meanTranscriptExpressionInTissue
+                    }
+                    transcriptWithMaxExpressionInTissue={
+                      expressionByTissue[tissue].transcriptWithMaxExpressionInTissue
+                    }
+                    tissue={tissue}
+                  />
+                )
+              }
             )}
             <span>
               <Button
diff --git a/browser/src/GenePage/TranscriptsTissueExpression.tsx b/browser/src/GenePage/TranscriptsTissueExpression.tsx
index 730944fb1..a5d6a0914 100644
--- a/browser/src/GenePage/TranscriptsTissueExpression.tsx
+++ b/browser/src/GenePage/TranscriptsTissueExpression.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components'
 
 import { Select } from '@gnomad/ui'
 
-import { AllGtexTissues } from '../gtex'
+import { GtexTissues } from '../gtex'
 
 import sortedTranscripts from './sortedTranscripts'
 import TranscriptsTissueExpressionPlot from './TranscriptsTissueExpressionPlot'
@@ -21,7 +21,7 @@ const isTranscriptCoding = (transcript: any) =>
   transcript.exons.some((exon: any) => exon.feature_type === 'CDS')
 
 type TranscriptsTissueExpressionProps = {
-  gtexTissues: Partial<AllGtexTissues>
+  gtexTissues: Partial<GtexTissues>
   transcripts: TranscriptWithTissueExpression[]
   includeNonCodingTranscripts: boolean
   preferredTranscriptId?: string
diff --git a/browser/src/GenePage/TranscriptsTissueExpressionPlot.tsx b/browser/src/GenePage/TranscriptsTissueExpressionPlot.tsx
index 12c03c33b..ea0b17e0f 100644
--- a/browser/src/GenePage/TranscriptsTissueExpressionPlot.tsx
+++ b/browser/src/GenePage/TranscriptsTissueExpressionPlot.tsx
@@ -4,8 +4,8 @@ import React from 'react'
 import { AxisBottom, AxisLeft } from '@visx/axis'
 
 import { TooltipAnchor } from '@gnomad/ui'
-import { AllGtexTissueNames, AllGtexTissues } from '../gtex'
 import { TranscriptWithTissueExpression } from './TissueExpressionTrack'
+import { GtexTissueName, GtexTissues } from '../gtex'
 
 const mergeOverlappingRegions = (regions: any) => {
   if (regions.length === 0) {
@@ -121,8 +121,8 @@ const margin = {
 }
 
 type TranscriptsTissueExpressionPlotProps = {
-  gtexTissues: Partial<AllGtexTissues>
-  tissues?: AllGtexTissueNames[]
+  gtexTissues: Partial<GtexTissues>
+  tissues?: GtexTissueName[]
   transcripts: TranscriptWithTissueExpression[]
   starredTranscriptId?: string
 }
@@ -133,7 +133,7 @@ const TranscriptsTissueExpressionPlot = ({
   transcripts,
   starredTranscriptId,
 }: TranscriptsTissueExpressionPlotProps) => {
-  type RenderedTissue = AllGtexTissueNames | 'Mean' | 'Median'
+  type RenderedTissue = GtexTissueName | 'Mean' | 'Median'
   const renderedTissues: RenderedTissue[] = ['Mean', 'Median', ...tissues!]
 
   const transcriptsWithMeanAndMedianExpression = transcripts.map((transcript) => {
@@ -148,7 +148,7 @@ const TranscriptsTissueExpressionPlot = ({
     return {
       ...transcript,
       gtex_tissue_expression: {
-        ...(gtexTissueExpressionObject as Partial<Record<AllGtexTissueNames, number>>),
+        ...(gtexTissueExpressionObject as Partial<Record<GtexTissueName, number>>),
         Mean: mean(expressionValues),
         Median: median(expressionValues),
       },
@@ -279,7 +279,7 @@ const TranscriptsTissueExpressionPlot = ({
         // @ts-expect-error TS(2322) FIXME: Type 'ScaleOrdinal<string, unknown, never>' is not... Remove this comment to see the full error message
         scale={xAxisScale}
         stroke="#333"
-        tickFormat={(tissue: AllGtexTissueNames) => {
+        tickFormat={(tissue: GtexTissueName) => {
           return gtexTissues[tissue] ? gtexTissues[tissue]!.fullName : tissue
         }}
         tickLabelProps={(value) => ({
@@ -354,11 +354,4 @@ const TranscriptsTissueExpressionPlot = ({
   )
 }
 
-// TranscriptsTissueExpressionPlot.defaultProps = {
-//   tissues: Object.entries(GTEX_TISSUE_NAMES)
-//     .sort((t1: any, t2: any) => t1[1].localeCompare(t2[1]))
-//     .map((t: any) => t[0]),
-//   starredTranscriptId: null,
-// }
-
 export default TranscriptsTissueExpressionPlot
diff --git a/browser/src/gtex.ts b/browser/src/gtex.ts
index e93a4faa6..c439932cb 100644
--- a/browser/src/gtex.ts
+++ b/browser/src/gtex.ts
@@ -23,10 +23,6 @@ const SHARED_GTEX_TISSUES = {
     fullName: 'Artery - Tibial',
     color: '#FF0000',
   },
-  bladder: {
-    fullName: 'Bladder',
-    color: '#AA0000',
-  },
   brain_amygdala: {
     fullName: 'Brain - Amygdala',
     color: '#EEEE00',
@@ -87,14 +83,6 @@ const SHARED_GTEX_TISSUES = {
     fullName: 'Cells - EBV-transformed lymphocytes',
     color: '#CC66FF',
   },
-  cervix_ectocervix: {
-    fullName: 'Cervix - Ectocervix',
-    color: '#FFCCCC',
-  },
-  cervix_endocervix: {
-    fullName: 'Cervix - Endocervix',
-    color: '#CCAADD',
-  },
   colon_sigmoid: {
     fullName: 'Colon - Sigmoid',
     color: '#EEBB77',
@@ -115,10 +103,6 @@ const SHARED_GTEX_TISSUES = {
     fullName: 'Esophagus - Muscularis',
     color: '#BB9988',
   },
-  fallopian_tube: {
-    fullName: 'Fallopian Tube',
-    color: '#FFCCCC',
-  },
   heart_atrial_appendage: {
     fullName: 'Heart - Atrial Appendage',
     color: '#9900FF',
@@ -209,25 +193,27 @@ const SHARED_GTEX_TISSUES = {
   },
 }
 
-type SharedGtexTissueNames = keyof typeof SHARED_GTEX_TISSUES
-
-export type TissueDetail = {
-  fullName: string
-  color: string
-}
-
 const V2_SPECIFIC_GTEX_TISSUES = {
+  bladder: {
+    fullName: 'Bladder',
+    color: '#AA0000',
+  },
   cells_transformed_fibroblasts: {
     fullName: 'Cells - Transformed fibroblasts',
     color: '#AAEEFF',
   },
-}
-
-type V2GtexTissueNames = SharedGtexTissueNames | keyof typeof V2_SPECIFIC_GTEX_TISSUES
-
-const V2_GTEX_TISSUES: Record<V2GtexTissueNames, TissueDetail> = {
-  ...SHARED_GTEX_TISSUES,
-  ...V2_SPECIFIC_GTEX_TISSUES,
+  cervix_ectocervix: {
+    fullName: 'Cervix - Ectocervix',
+    color: '#FFCCCC',
+  },
+  cervix_endocervix: {
+    fullName: 'Cervix - Endocervix',
+    color: '#CCAADD',
+  },
+  fallopian_tube: {
+    fullName: 'Fallopian Tube',
+    color: '#FFCCCC',
+  },
 }
 
 const V4_SPECIFIC_GTEX_TISSUES = {
@@ -235,92 +221,22 @@ const V4_SPECIFIC_GTEX_TISSUES = {
     fullName: 'Cells - Cultured fibroblasts',
     color: '#AAEEFF',
   },
-  colon_transverse_mixed_cell: {
-    fullName: 'Colon - Transverse mixed cell',
-    color: '#CC9955',
-  },
-  colon_transverse_mucosa: {
-    fullName: 'Colon - Transverse mucosa',
-    color: '#CC9955',
-  },
-  colon_transverse_muscularis: {
-    fullName: 'Colon - Transverse muscularis',
-    color: '#CC9955',
-  },
-  kidney_medulla: {
-    fullName: 'Kidney - Medulla',
-    color: '#33FFC2',
-  },
-  liver_hepatocyte: {
-    fullName: 'Liver - Hepatocyte',
-    color: '#AABB66',
-  },
-  liver_mixed_cell: {
-    fullName: 'Liver - Mixed cell',
-    color: '#AABB66',
-  },
-  liver_portal_tract: {
-    fullName: 'Liver - Portal tract',
-    color: '#AABB66',
-  },
-  pancreas_acini: {
-    fullName: 'Pancreas - Acini',
-    color: '#995522',
-  },
-  pancreas_islets: {
-    fullName: 'Pancreas - Islets',
-    color: '#995522',
-  },
-  pancreas_mixed_cell: {
-    fullName: 'Pancreas - Mixed cell',
-    color: '#995522',
-  },
-  small_intestine_terminal_ileum_lymphoid_aggregate: {
-    fullName: 'Small Intestine - Terminal ileum lymphoid aggregate',
-    color: '#555522',
-  },
-  small_intestine_terminal_ileum_mixed_cell: {
-    fullName: 'Small intestine - Terminal ileum mixed cell',
-    color: '#555522',
-  },
-  stomach_mixed_cell: {
-    fullName: 'Stomach - Mixed cell',
-    color: '#FFDD99',
-  },
-  stomach_mucosa: {
-    fullName: 'Stomach - Mucosa',
-    color: '#FFDD99',
-  },
-  stomach_muscularis: {
-    fullName: 'Stomach - Muscularis',
-    color: '#FFDD99',
-  },
 }
 
-type V4GtexTissueNames = SharedGtexTissueNames | keyof typeof V4_SPECIFIC_GTEX_TISSUES
-
-export type AllGtexTissueNames =
-  | SharedGtexTissueNames
+export type GtexTissueName =
+  | keyof typeof SHARED_GTEX_TISSUES
   | keyof typeof V2_SPECIFIC_GTEX_TISSUES
   | keyof typeof V4_SPECIFIC_GTEX_TISSUES
 
-export type AllGtexTissues = Record<AllGtexTissueNames, TissueDetail>
+export type TissueDetail = {
+  fullName: string
+  color: string
+}
+
+export type GtexTissues = Record<GtexTissueName, TissueDetail>
 
-const V4_GTEX_TISSUES: Record<V4GtexTissueNames, TissueDetail> = {
+export const ALL_GTEX_TISSUES: GtexTissues = {
   ...SHARED_GTEX_TISSUES,
+  ...V2_SPECIFIC_GTEX_TISSUES,
   ...V4_SPECIFIC_GTEX_TISSUES,
 }
-
-export const GTEX_TISSUES: {
-  v2: Record<V2GtexTissueNames, TissueDetail>
-  v4: Record<V4GtexTissueNames, TissueDetail>
-  default: Record<SharedGtexTissueNames, TissueDetail>
-  v3: Record<SharedGtexTissueNames, TissueDetail>
-  ExAC: Record<SharedGtexTissueNames, TissueDetail>
-} = {
-  v2: V2_GTEX_TISSUES,
-  v4: V4_GTEX_TISSUES,
-  default: SHARED_GTEX_TISSUES,
-  v3: SHARED_GTEX_TISSUES,
-  ExAC: SHARED_GTEX_TISSUES,
-}