diff --git a/browser/src/GenePage/GenePage.tsx b/browser/src/GenePage/GenePage.tsx
index 15be9baa8..f93a8712b 100644
--- a/browser/src/GenePage/GenePage.tsx
+++ b/browser/src/GenePage/GenePage.tsx
@@ -50,7 +50,7 @@ import MitochondrialGeneCoverageTrack from './MitochondrialGeneCoverageTrack'
 import MitochondrialVariantsInGene from './MitochondrialVariantsInGene'
 import { getPreferredTranscript } from './preferredTranscript'
 import StructuralVariantsInGene from './StructuralVariantsInGene'
-import TissueExpressionTrack from './TissueExpressionTrack'
+import TissueExpressionTrack, { TranscriptWithTissueExpression } from './TissueExpressionTrack'
 import VariantsInGene from './VariantsInGene'
 
 import { GnomadConstraint } from '../ConstraintTable/GnomadConstraintTable'
@@ -71,6 +71,7 @@ import {
   LegendSwatch,
 } from '../ChartStyles'
 import { logButtonClick } from '../analytics'
+import { GtexTissueExpression } from './TranscriptsTissueExpression'
 
 export type Strand = '+' | '-'
 
@@ -88,6 +89,30 @@ export type GeneMetadata = {
   flags: string[]
 }
 
+export type GeneTranscript = {
+  transcript_id: string
+  transcript_version: string
+  exons: {
+    feature_type: string
+    start: number
+    stop: number
+  }[]
+  gtex_tissue_expression: GtexTissueExpression | null
+}
+
+export type Pext = {
+  regions: {
+    start: number
+    stop: number
+    mean: number
+    tissues: {
+      tissue: string
+      value: number
+    }[]
+  }[]
+  flags: string[]
+}
+
 export type Gene = GeneMetadata & {
   reference_genome: ReferenceGenome
   name?: string
@@ -100,29 +125,11 @@ export type Gene = GeneMetadata & {
     start: number
     stop: number
   }[]
-  transcripts: {
-    transcript_id: string
-    transcript_version: string
-    exons: {
-      feature_type: string
-      start: number
-      stop: number
-    }[]
-  }[]
+  transcripts: GeneTranscript[]
   flags: string[]
   gnomad_constraint?: GnomadConstraint
   exac_constraint?: ExacConstraint
-  pext?: {
-    regions: {
-      start: number
-      stop: number
-      mean: number
-      tissues: {
-        [key: string]: number
-      }
-    }[]
-    flags: string[]
-  }
+  pext?: Pext
   short_tandem_repeats?: {
     id: string
   }[]
@@ -517,6 +524,7 @@ const GenePage = ({ datasetId, gene, geneId }: Props) => {
           <TrackWrapper>
             <GeneTranscriptsTrack
               datasetId={datasetId}
+              isTissueExpressionAvailable={!!gene.pext}
               gene={gene}
               includeNonCodingTranscripts={includeNonCodingTranscripts}
               includeUTRs={includeUTRs}
@@ -531,7 +539,7 @@ const GenePage = ({ datasetId, gene, geneId }: Props) => {
             exons={cdsCompositeExons}
             expressionRegions={gene.pext.regions}
             flags={gene.pext.flags}
-            transcripts={gene.transcripts}
+            transcripts={gene.transcripts as TranscriptWithTissueExpression[]} // if a gene has pext, it has gtex
             preferredTranscriptId={preferredTranscriptId}
             preferredTranscriptDescription={preferredTranscriptDescription}
           />
@@ -563,7 +571,6 @@ const GenePage = ({ datasetId, gene, geneId }: Props) => {
           <VariantsInGene
             datasetId={datasetId}
             gene={gene}
-            // @ts-expect-error TS(2322) FIXME: Type '{ datasetId: string; gene: { gene_id: string... Remove this comment to see the full error message
             includeNonCodingTranscripts={includeNonCodingTranscripts}
             includeUTRs={includeUTRs}
             zoomRegion={zoomRegion}
diff --git a/browser/src/GenePage/GenePageContainer.tsx b/browser/src/GenePage/GenePageContainer.tsx
index e78711c20..1b0cd7e47 100644
--- a/browser/src/GenePage/GenePageContainer.tsx
+++ b/browser/src/GenePage/GenePageContainer.tsx
@@ -98,59 +98,8 @@ query ${operationName}($geneId: String, $geneSymbol: String, $referenceGenome: R
         stop
       }
       gtex_tissue_expression {
-        adipose_subcutaneous
-        adipose_visceral_omentum
-        adrenal_gland
-        artery_aorta
-        artery_coronary
-        artery_tibial
-        bladder
-        brain_amygdala
-        brain_anterior_cingulate_cortex_ba24
-        brain_caudate_basal_ganglia
-        brain_cerebellar_hemisphere
-        brain_cerebellum
-        brain_cortex
-        brain_frontal_cortex_ba9
-        brain_hippocampus
-        brain_hypothalamus
-        brain_nucleus_accumbens_basal_ganglia
-        brain_putamen_basal_ganglia
-        brain_spinal_cord_cervical_c_1
-        brain_substantia_nigra
-        breast_mammary_tissue
-        cells_ebv_transformed_lymphocytes
-        cells_transformed_fibroblasts
-        cervix_ectocervix
-        cervix_endocervix
-        colon_sigmoid
-        colon_transverse
-        esophagus_gastroesophageal_junction
-        esophagus_mucosa
-        esophagus_muscularis
-        fallopian_tube
-        heart_atrial_appendage
-        heart_left_ventricle
-        kidney_cortex
-        liver
-        lung
-        minor_salivary_gland
-        muscle_skeletal
-        nerve_tibial
-        ovary
-        pancreas
-        pituitary
-        prostate
-        skin_not_sun_exposed_suprapubic
-        skin_sun_exposed_lower_leg
-        small_intestine_terminal_ileum
-        spleen
-        stomach
-        testis
-        thyroid
-        uterus
-        vagina
-        whole_blood
+        tissue
+        value
       }
     }
     pext {
@@ -159,59 +108,8 @@ query ${operationName}($geneId: String, $geneSymbol: String, $referenceGenome: R
         stop
         mean
         tissues {
-          adipose_subcutaneous
-          adipose_visceral_omentum
-          adrenal_gland
-          artery_aorta
-          artery_coronary
-          artery_tibial
-          bladder
-          brain_amygdala
-          brain_anterior_cingulate_cortex_ba24
-          brain_caudate_basal_ganglia
-          brain_cerebellar_hemisphere
-          brain_cerebellum
-          brain_cortex
-          brain_frontal_cortex_ba9
-          brain_hippocampus
-          brain_hypothalamus
-          brain_nucleus_accumbens_basal_ganglia
-          brain_putamen_basal_ganglia
-          brain_spinal_cord_cervical_c_1
-          brain_substantia_nigra
-          breast_mammary_tissue
-          cells_ebv_transformed_lymphocytes
-          cells_transformed_fibroblasts
-          cervix_ectocervix
-          cervix_endocervix
-          colon_sigmoid
-          colon_transverse
-          esophagus_gastroesophageal_junction
-          esophagus_mucosa
-          esophagus_muscularis
-          fallopian_tube
-          heart_atrial_appendage
-          heart_left_ventricle
-          kidney_cortex
-          liver
-          lung
-          minor_salivary_gland
-          muscle_skeletal
-          nerve_tibial
-          ovary
-          pancreas
-          pituitary
-          prostate
-          skin_not_sun_exposed_suprapubic
-          skin_sun_exposed_lower_leg
-          small_intestine_terminal_ileum
-          spleen
-          stomach
-          testis
-          thyroid
-          uterus
-          vagina
-          whole_blood
+          tissue
+          value
         }
       }
       flags
diff --git a/browser/src/GenePage/GeneTranscriptsTrack.tsx b/browser/src/GenePage/GeneTranscriptsTrack.tsx
index fde9bd104..3b70f9e44 100644
--- a/browser/src/GenePage/GeneTranscriptsTrack.tsx
+++ b/browser/src/GenePage/GeneTranscriptsTrack.tsx
@@ -8,13 +8,14 @@ import { Track } from '@gnomad/region-viewer'
 import TranscriptsTrack from '@gnomad/track-transcripts'
 import { Button, Modal, TooltipAnchor } from '@gnomad/ui'
 
-import { GTEX_TISSUE_NAMES } 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 { hasStructuralVariants } from '../../../dataset-metadata/metadata'
+import { DatasetId, hasStructuralVariants } from '../../../dataset-metadata/metadata'
+import { GtexTissueDetail, TranscriptWithTissueExpression } from './TissueExpressionTrack'
 
 const TranscriptsInfoWrapper = styled.div`
   display: flex;
@@ -34,8 +35,9 @@ const RightPanel = styled.div`
   padding: 0.375em;
 `
 
-type OwnProps = {
-  datasetId: string
+type GeneTranscriptsTrack = {
+  datasetId: DatasetId
+  isTissueExpressionAvailable: boolean
   gene: Gene
   includeNonCodingTranscripts: boolean
   includeUTRs: boolean
@@ -43,27 +45,36 @@ type OwnProps = {
   preferredTranscriptDescription?: string | React.ReactNode
 }
 
-// @ts-expect-error TS(2456) FIXME: Type alias 'Props' circularly references itself.
-type Props = OwnProps & typeof GeneTranscriptsTrack.defaultProps
-
-// @ts-expect-error TS(7022) FIXME: 'GeneTranscriptsTrack' implicitly has type 'any' b... Remove this comment to see the full error message
 const GeneTranscriptsTrack = ({
   datasetId,
+  isTissueExpressionAvailable,
   gene,
   includeNonCodingTranscripts,
   includeUTRs,
   preferredTranscriptId,
   preferredTranscriptDescription,
-}: Props) => {
+}: GeneTranscriptsTrack) => {
   const transcriptsTrack = useRef(null)
-
-  const isTissueExpressionAvailable = gene.reference_genome === 'GRCh37'
   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.map((transcript: any) =>
-          mean(Object.values(transcript.gtex_tissue_expression))
+        (gene.transcripts as TranscriptWithTissueExpression[]).map(
+          (transcript) => mean(transcript.gtex_tissue_expression.map((tissue) => tissue.value))!
         )
       )
     : undefined
@@ -129,15 +140,36 @@ const GeneTranscriptsTrack = ({
         renderTranscriptRightPanel={
           !isTissueExpressionAvailable
             ? null
-            : ({ transcript, width }: any) => {
+            : ({
+                transcript,
+                width,
+              }: {
+                transcript: TranscriptWithTissueExpression
+                width: number
+              }) => {
                 if (width < 36) {
                   return null
                 }
 
-                const meanExpression = mean(Object.values(transcript.gtex_tissue_expression))
-                const maxExpression = max(Object.values(transcript.gtex_tissue_expression))
-                const tissueMostExpressedIn = Object.keys(transcript.gtex_tissue_expression).find(
-                  (tissue: any) => transcript.gtex_tissue_expression[tissue] === maxExpression
+                const meanExpression = mean(
+                  transcript.gtex_tissue_expression.map(
+                    (tissueExpression) => tissueExpression.value
+                  )
+                )!
+                const maxExpression = max(
+                  transcript.gtex_tissue_expression.map(
+                    (tissueExpression) => tissueExpression.value
+                  )
+                )!
+                const tissueMostExpressedIn = transcript.gtex_tissue_expression.find(
+                  (tissue) => tissue.value === maxExpression
+                )!.tissue
+
+                const circleRadiusMeanContribution = meanExpression === 0 ? 0 : 0.25
+                const circleRadiusMaxMeanContribution =
+                  maxMeanExpression === 0 ? 0 : meanExpression / maxMeanExpression!
+                const circleRadius = Math.sqrt(
+                  circleRadiusMeanContribution + 23.75 * circleRadiusMaxMeanContribution
                 )
 
                 return (
@@ -147,12 +179,8 @@ const GeneTranscriptsTrack = ({
                       tooltip={`Mean expression across all tissues = ${meanExpression.toFixed(
                         2
                       )} TPM\nMost expressed in ${
-                        // @ts-expect-error TS(2538) FIXME: Type 'undefined' cannot be used as an index type.
-                        GTEX_TISSUE_NAMES[tissueMostExpressedIn]
-                      } (${
-                        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
-                        maxExpression.toFixed(2)
-                      } TPM)`}
+                        gtexTissues[tissueMostExpressedIn as GtexTissueName]!.fullName
+                      } (${maxExpression.toFixed(2)} TPM)`}
                     >
                       <rect
                         x={0}
@@ -163,20 +191,7 @@ const GeneTranscriptsTrack = ({
                         pointerEvents="visible"
                       />
                     </TooltipAnchor>
-                    <circle
-                      cx={15}
-                      cy={5}
-                      r={Math.sqrt(
-                        meanExpression === 0
-                          ? 0
-                          : 0.25 +
-                              23.75 *
-                                // @ts-expect-error TS(2367) FIXME: This condition will always return 'false' since th... Remove this comment to see the full error message
-                                (maxMeanExpression === 0 ? 0 : meanExpression / maxMeanExpression)
-                      )}
-                      fill="#333"
-                      pointerEvents="none"
-                    />
+                    <circle cx={15} cy={5} r={circleRadius} fill="#333" pointerEvents="none" />
                   </svg>
                 )
               }
@@ -195,7 +210,8 @@ const GeneTranscriptsTrack = ({
           }}
         >
           <TranscriptsTissueExpression
-            transcripts={gene.transcripts}
+            gtexTissues={gtexTissues}
+            transcripts={gene.transcripts as TranscriptWithTissueExpression[]}
             includeNonCodingTranscripts={includeNonCodingTranscripts}
             preferredTranscriptId={preferredTranscriptId}
             preferredTranscriptDescription={preferredTranscriptDescription}
diff --git a/browser/src/GenePage/TissueExpressionTrack.tsx b/browser/src/GenePage/TissueExpressionTrack.tsx
index b83a13efa..6c3e8741f 100644
--- a/browser/src/GenePage/TissueExpressionTrack.tsx
+++ b/browser/src/GenePage/TissueExpressionTrack.tsx
@@ -9,12 +9,13 @@ import { Track } from '@gnomad/region-viewer'
 import { RegionsPlot } from '@gnomad/track-regions'
 import { Badge, Button, Modal, SearchInput, Select, TooltipAnchor } from '@gnomad/ui'
 
-import { GTEX_TISSUE_COLORS, GTEX_TISSUE_NAMES } from '../gtex'
+import { ALL_GTEX_TISSUES, GtexTissueName, GtexTissues } from '../gtex'
 import InfoButton from '../help/InfoButton'
 
 import { logButtonClick } from '../analytics'
 
-import TranscriptsTissueExpression from './TranscriptsTissueExpression'
+import TranscriptsTissueExpression, { GtexTissueExpression } from './TranscriptsTissueExpression'
+import { GeneTranscript } from './GenePage'
 
 const getPlotRegions = (expressionRegions: any, getValueForRegion: any) => {
   const roundedRegions = expressionRegions.map((region: any) => ({
@@ -67,6 +68,7 @@ const TRACK_HEIGHT = 20
 const heightScale = scaleLinear().domain([0, 1]).range([0, TRACK_HEIGHT]).clamp(true)
 
 type PextRegionsPlotProps = {
+  gtexTissues: Partial<GtexTissues>
   color: string
   regions: {
     start: number
@@ -145,8 +147,13 @@ const NotExpressedMessage = styled.div`
   color: gray;
   font-size: 10px;
 `
+type ExpressedTissue = {
+  tissue: string
+  value: number
+}
 
-type OwnIndividualTissueTrackProps = {
+type IndividualTissueTrackProps = {
+  gtexTissues: Partial<GtexTissues>
   exons: {
     start: number
     stop: number
@@ -155,26 +162,20 @@ type OwnIndividualTissueTrackProps = {
     start: number
     stop: number
     mean?: number
-    tissues: {
-      [key: string]: number
-    }
+    tissues: ExpressedTissue[]
   }[]
   maxTranscriptExpressionInTissue: number
   maxMeanTranscriptExpressionInAnyTissue: number
   meanTranscriptExpressionInTissue: number
-  tissue: string
-  transcriptWithMaxExpressionInTissue?: {
+  tissue: GtexTissueName
+  transcriptWithMaxExpressionInTissue: {
     transcript_id: string
     transcript_version: string
-  }
+  } | null
 }
 
-// @ts-expect-error TS(2456) FIXME: Type alias 'IndividualTissueTrackProps' circularly... Remove this comment to see the full error message
-type IndividualTissueTrackProps = OwnIndividualTissueTrackProps &
-  typeof IndividualTissueTrack.defaultProps
-
-// @ts-expect-error TS(7022) FIXME: 'IndividualTissueTrack' implicitly has type 'any' ... Remove this comment to see the full error message
 const IndividualTissueTrack = ({
+  gtexTissues,
   exons,
   expressionRegions,
   maxTranscriptExpressionInTissue,
@@ -183,11 +184,16 @@ const IndividualTissueTrack = ({
   tissue,
   transcriptWithMaxExpressionInTissue,
 }: IndividualTissueTrackProps) => {
-  const isExpressed = expressionRegions.some((region: any) => region.tissues[tissue] !== 0)
+  const isExpressed = expressionRegions.some(
+    (region: any) =>
+      region.tissues.find((tissueObject: ExpressedTissue) => tissueObject.tissue === tissue)
+        ?.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>{GTEX_TISSUE_NAMES[tissue]}</TissueName>}
+      renderLeftPanel={() => <TissueName>{gtexTissues[tissue].fullName}</TissueName>}
       renderRightPanel={({ width }: any) =>
         width > 36 && (
           <svg width={width} height={31}>
@@ -212,11 +218,10 @@ const IndividualTissueTrack = ({
                       2
                     )} TPM\nMax transcript expression in this tissue = ${maxTranscriptExpressionInTissue.toFixed(
                       2
-                    )} (${transcriptWithMaxExpressionInTissue.transcript_id}.${
-                      transcriptWithMaxExpressionInTissue.transcript_version
+                    )} (${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 ${GTEX_TISSUE_NAMES[tissue]}`
+                  : `Gene is not expressed in ${gtexTissues[tissue]!.fullName}`
               }
             >
               <rect x={12} y={2} width={25} height={27} fill="none" pointerEvents="visible" />
@@ -249,9 +254,14 @@ const IndividualTissueTrack = ({
         return (
           <PlotWrapper key={tissue}>
             <PextRegionsPlot
-              // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-              color={GTEX_TISSUE_COLORS[tissue]}
-              regions={getPlotRegions(expressionRegions, (r: any) => r.tissues[tissue])}
+              gtexTissues={gtexTissues}
+              color={gtexTissues[tissue]!.color}
+              regions={getPlotRegions(
+                expressionRegions,
+                (r: any) =>
+                  r.tissues.find((tissueObject: ExpressedTissue) => tissueObject.tissue === tissue)
+                    ?.value || 0
+              )}
               scalePosition={scalePosition}
               width={width}
             />
@@ -310,7 +320,12 @@ const RightPanel = styled.div`
   margin-top: 1.25em;
 `
 
-type OwnTissueExpressionTrackProps = {
+// Omit gtex then re-include to remove the possible null, as this component only renders if gtex and pext are non null
+export type TranscriptWithTissueExpression = Omit<GeneTranscript, 'gtex_tissue_expression'> & {
+  gtex_tissue_expression: GtexTissueExpression
+}
+
+type TissueExpressionTrackProps = {
   exons: {
     start: number
     stop: number
@@ -320,28 +335,22 @@ type OwnTissueExpressionTrackProps = {
     stop: number
     mean?: number
     tissues: {
-      [key: string]: number
-    }
-  }[]
-  flags: string[]
-  transcripts: {
-    transcript_id: string
-    transcript_version: string
-    exons: {
-      feature_type: string
-      start: number
-      stop: number
+      tissue: string
+      value: number
     }[]
   }[]
+  flags: string[]
+  transcripts: TranscriptWithTissueExpression[]
   preferredTranscriptId?: string
   preferredTranscriptDescription?: string | React.ReactNode
 }
 
-// @ts-expect-error TS(2456) FIXME: Type alias 'TissueExpressionTrackProps' circularly... Remove this comment to see the full error message
-type TissueExpressionTrackProps = OwnTissueExpressionTrackProps &
-  typeof TissueExpressionTrack.defaultProps
+export type GtexTissueDetail = {
+  fullName: string
+  color: string
+  value: number
+}
 
-// @ts-expect-error TS(7022) FIXME: 'TissueExpressionTrack' implicitly has type 'any' ... Remove this comment to see the full error message
 const TissueExpressionTrack = ({
   exons,
   expressionRegions,
@@ -355,57 +364,96 @@ const TissueExpressionTrack = ({
     useState(false)
   const [tissueFilterText, setTissueFilterText] = useState('')
   const mainTrack = useRef()
+  const [sortTissuesBy, setSortTissuesBy] = useState<'alphabetical' | 'mean-expression'>(
+    'alphabetical'
+  )
 
-  const [sortTissuesBy, setSortTissuesBy] = useState('alphabetical')
-
-  const expressionByTissue = Object.keys(GTEX_TISSUE_NAMES).reduce((acc, tissueId) => {
-    let maxTranscriptExpressionInTissue = 0
-    let transcriptWithMaxExpressionInTissue = null
-    transcripts.forEach((transcript: any) => {
-      const expressionInTissue = transcript.gtex_tissue_expression[tissueId]
-      if (expressionInTissue > maxTranscriptExpressionInTissue) {
-        maxTranscriptExpressionInTissue = expressionInTissue
-        transcriptWithMaxExpressionInTissue = transcript
+  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,
       }
     })
 
-    const meanTranscriptExpressionInTissue = mean(
-      transcripts.map((transcript: any) => transcript.gtex_tissue_expression[tissueId])
-    )
+  type ExpressionByTissueDetails = {
+    maxTranscriptExpressionInTissue: number
+    meanTranscriptExpressionInTissue: number
+    transcriptWithMaxExpressionInTissue: {
+      transcript_id: string
+      transcript_version: string
+    } | null
+  }
+  type ExpressionByTissue = Record<string, ExpressionByTissueDetails>
 
-    return {
-      ...acc,
-      [tissueId]: {
-        maxTranscriptExpressionInTissue,
-        meanTranscriptExpressionInTissue,
-        transcriptWithMaxExpressionInTissue,
-      },
-    }
-  }, {})
+  const expressionByTissue: ExpressionByTissue = Object.keys(gtexTissues).reduce(
+    (acc, tissueId) => {
+      let maxTranscriptExpressionInTissue = 0
+      let transcriptWithMaxExpressionInTissue = null
 
-  const maxMeanTranscriptExpressionInAnyTissue = max(
-    Object.values(expressionByTissue).map((v: any) => v.meanTranscriptExpressionInTissue)
-  )
+      transcripts.forEach((transcript) => {
+        const expressionInTissue = transcript.gtex_tissue_expression.find(
+          (tissue) => tissue.tissue === tissueId
+        )
 
-  let tissues
-  if (sortTissuesBy === 'mean-expression') {
-    tissues = Object.entries(GTEX_TISSUE_NAMES)
-      .sort((t1: any, t2: any) => {
-        // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-        const t1Expression = expressionByTissue[t1[0]].meanTranscriptExpressionInTissue
-        // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-        const t2Expression = expressionByTissue[t2[0]].meanTranscriptExpressionInTissue
-        if (t1Expression === t2Expression) {
-          return t1[1].localeCompare(t2[1])
+        if (expressionInTissue && expressionInTissue.value > maxTranscriptExpressionInTissue) {
+          maxTranscriptExpressionInTissue = expressionInTissue.value
+          transcriptWithMaxExpressionInTissue = {
+            transcript_id: transcript.transcript_id,
+            transcript_version: transcript.transcript_version,
+          }
         }
-        return t2Expression - t1Expression
       })
-      .map((t: any) => t[0])
-  } else {
-    tissues = Object.entries(GTEX_TISSUE_NAMES)
-      .sort((t1: any, t2: any) => t1[1].localeCompare(t2[1]))
-      .map((t: any) => t[0])
-  }
+
+      const meanTranscriptExpressionInTissue = mean(
+        transcripts
+          .map(
+            (transcript) =>
+              transcript.gtex_tissue_expression.find((tissue) => tissue.tissue === tissueId)?.value
+          )
+          .filter((value): value is number => value !== undefined)
+      )
+
+      return {
+        ...acc,
+        [tissueId]: {
+          maxTranscriptExpressionInTissue,
+          meanTranscriptExpressionInTissue,
+          transcriptWithMaxExpressionInTissue,
+        },
+      }
+    },
+    {}
+  )
+
+  const maxMeanTranscriptExpressionInAnyTissue = max(
+    Object.values(expressionByTissue).map((v) => v.meanTranscriptExpressionInTissue)
+  )!
+
+  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)
 
@@ -471,6 +519,7 @@ const TissueExpressionTrack = ({
               return (
                 <PlotWrapper>
                   <PextRegionsPlot
+                    gtexTissues={gtexTissues}
                     color="#428bca"
                     regions={getPlotRegions(expressionRegions, (r: any) => r.mean)}
                     scalePosition={scalePosition}
@@ -547,27 +596,27 @@ const TissueExpressionTrack = ({
               }}
             </Track>
             {(tissueFilterText ? tissues.filter(tissuePredicate(tissueFilterText)) : tissues).map(
-              (tissue: any) => (
-                <IndividualTissueTrack
-                  key={tissue}
-                  exons={exons}
-                  expressionRegions={expressionRegions}
-                  maxTranscriptExpressionInTissue={
-                    // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-                    expressionByTissue[tissue].maxTranscriptExpressionInTissue
-                  }
-                  maxMeanTranscriptExpressionInAnyTissue={maxMeanTranscriptExpressionInAnyTissue}
-                  meanTranscriptExpressionInTissue={
-                    // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-                    expressionByTissue[tissue].meanTranscriptExpressionInTissue
-                  }
-                  transcriptWithMaxExpressionInTissue={
-                    // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-                    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
@@ -595,6 +644,7 @@ const TissueExpressionTrack = ({
           }}
         >
           <TranscriptsTissueExpression
+            gtexTissues={gtexTissues}
             transcripts={transcripts}
             includeNonCodingTranscripts
             preferredTranscriptId={preferredTranscriptId}
diff --git a/browser/src/GenePage/TranscriptsTissueExpression.tsx b/browser/src/GenePage/TranscriptsTissueExpression.tsx
index 08a79a7b3..a5d6a0914 100644
--- a/browser/src/GenePage/TranscriptsTissueExpression.tsx
+++ b/browser/src/GenePage/TranscriptsTissueExpression.tsx
@@ -4,10 +4,11 @@ import styled from 'styled-components'
 
 import { Select } from '@gnomad/ui'
 
-import { GTEX_TISSUE_NAMES } from '../gtex'
+import { GtexTissues } from '../gtex'
 
 import sortedTranscripts from './sortedTranscripts'
 import TranscriptsTissueExpressionPlot from './TranscriptsTissueExpressionPlot'
+import { TranscriptWithTissueExpression } from './TissueExpressionTrack'
 
 const ScrollWrapper = styled.div`
   display: inline-block;
@@ -19,84 +20,24 @@ const ScrollWrapper = styled.div`
 const isTranscriptCoding = (transcript: any) =>
   transcript.exons.some((exon: any) => exon.feature_type === 'CDS')
 
-type OwnTranscriptsTissueExpressionProps = {
-  transcripts: {
-    transcript_id: string
-    transcript_version: string
-    exons: {
-      feature_type: string
-      start: number
-      stop: number
-    }[]
-  }[]
+type TranscriptsTissueExpressionProps = {
+  gtexTissues: Partial<GtexTissues>
+  transcripts: TranscriptWithTissueExpression[]
   includeNonCodingTranscripts: boolean
   preferredTranscriptId?: string
   preferredTranscriptDescription?: string | React.ReactNode
   defaultSortTissuesBy?: 'alphabetical' | 'mean-expression'
 }
 
-export type GtexTissueExpression = {
-  adipose_subcutaneous: number
-  adipose_visceral_omentum: number
-  adrenal_gland: number
-  artery_aorta: number
-  artery_coronary: number
-  artery_tibial: number
-  bladder: number
-  brain_amygdala: number
-  brain_anterior_cingulate_cortex_ba24: number
-  brain_caudate_basal_ganglia: number
-  brain_cerebellar_hemisphere: number
-  brain_cerebellum: number
-  brain_cortex: number
-  brain_frontal_cortex_ba9: number
-  brain_hippocampus: number
-  brain_hypothalamus: number
-  brain_nucleus_accumbens_basal_ganglia: number
-  brain_putamen_basal_ganglia: number
-  brain_spinal_cord_cervical_c_1: number
-  brain_substantia_nigra: number
-  breast_mammary_tissue: number
-  cells_ebv_transformed_lymphocytes: number
-  cells_transformed_fibroblasts: number
-  cervix_ectocervix: number
-  cervix_endocervix: number
-  colon_sigmoid: number
-  colon_transverse: number
-  esophagus_gastroesophageal_junction: number
-  esophagus_mucosa: number
-  esophagus_muscularis: number
-  fallopian_tube: number
-  heart_atrial_appendage: number
-  heart_left_ventricle: number
-  kidney_cortex: number
-  liver: number
-  lung: number
-  minor_salivary_gland: number
-  muscle_skeletal: number
-  nerve_tibial: number
-  ovary: number
-  pancreas: number
-  pituitary: number
-  prostate: number
-  skin_not_sun_exposed_suprapubic: number
-  skin_sun_exposed_lower_leg: number
-  small_intestine_terminal_ileum: number
-  spleen: number
-  stomach: number
-  testis: number
-  thyroid: number
-  uterus: number
-  vagina: number
-  whole_blood: number
+export type TissueExpression = {
+  tissue: string
+  value: number
 }
 
-// @ts-expect-error TS(2456) FIXME: Type alias 'TranscriptsTissueExpressionProps' circ... Remove this comment to see the full error message
-type TranscriptsTissueExpressionProps = OwnTranscriptsTissueExpressionProps &
-  typeof TranscriptsTissueExpression.defaultProps
+export type GtexTissueExpression = TissueExpression[]
 
-// @ts-expect-error TS(7022) FIXME: 'TranscriptsTissueExpression' implicitly has type ... Remove this comment to see the full error message
 const TranscriptsTissueExpression = ({
+  gtexTissues,
   transcripts,
   includeNonCodingTranscripts,
   preferredTranscriptId,
@@ -109,8 +50,14 @@ const TranscriptsTissueExpression = ({
     sortTranscriptsBy === 'default'
       ? sortedTranscripts(transcripts, preferredTranscriptId)
       : [...transcripts].sort((t1, t2) => {
-          const t1Expression = t1.gtex_tissue_expression[sortTranscriptsBy] || 0
-          const t2Expression = t2.gtex_tissue_expression[sortTranscriptsBy] || 0
+          const t1Expression =
+            t1.gtex_tissue_expression.find(
+              (tissue: TissueExpression) => tissue.tissue === sortTranscriptsBy
+            )!.value || 0
+          const t2Expression =
+            t2.gtex_tissue_expression.find(
+              (tissue: TissueExpression) => tissue.tissue === sortTranscriptsBy
+            )!.value || 0
 
           if (t1Expression === t2Expression) {
             return t1.transcript_id.localeCompare(t2.transcript_id)
@@ -122,31 +69,34 @@ const TranscriptsTissueExpression = ({
   const [sortTissuesBy, setSortTissuesBy] = useState(defaultSortTissuesBy)
   let tissues
   if (sortTissuesBy === 'mean-expression') {
-    const meanExpressionByTissue = Object.keys(GTEX_TISSUE_NAMES).reduce(
+    const meanExpressionByTissue: Record<string, number> = Object.keys(gtexTissues).reduce(
       (acc, tissueId) => ({
         ...acc,
         [tissueId]: mean(
-          transcripts.map((transcript: any) => transcript.gtex_tissue_expression[tissueId] || 0)
+          transcripts.map(
+            (transcript: any) =>
+              transcript.gtex_tissue_expression.find(
+                (tissue: TissueExpression) => tissue.tissue === tissueId
+              ).value || 0
+          )
         ),
       }),
       {}
     )
-    tissues = Object.entries(GTEX_TISSUE_NAMES)
-      .sort((t1: any, t2: any) => {
-        // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
+    tissues = Object.entries(gtexTissues)
+      .sort((t1, t2) => {
         const t1Expression = meanExpressionByTissue[t1[0]]
-        // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
         const t2Expression = meanExpressionByTissue[t2[0]]
         if (t1Expression === t2Expression) {
-          return t1[1].localeCompare(t2[1])
+          return t1[1].fullName.localeCompare(t2[1].fullName)
         }
         return t2Expression - t1Expression
       })
       .map((t: any) => t[0])
   } else {
-    tissues = Object.entries(GTEX_TISSUE_NAMES)
-      .sort((t1: any, t2: any) => t1[1].localeCompare(t2[1]))
-      .map((t: any) => t[0])
+    tissues = Object.entries(gtexTissues)
+      .sort((t1, t2) => t1[1].fullName.localeCompare(t2[1].fullName))
+      .map((t) => t[0])
   }
 
   if (!includeNonCodingTranscripts) {
@@ -166,10 +116,10 @@ const TranscriptsTissueExpression = ({
           >
             <option value="default">Default</option>
             <optgroup label="Expression in tissue">
-              {Object.entries(GTEX_TISSUE_NAMES).map(([tissueId, tissueName]) => {
+              {Object.entries(gtexTissues).map(([tissueId, tissueDetails]) => {
                 return (
                   <option key={tissueId} value={tissueId}>
-                    {tissueName}
+                    {tissueDetails.fullName}
                   </option>
                 )
               })}
@@ -193,8 +143,9 @@ const TranscriptsTissueExpression = ({
       {preferredTranscriptDescription && <p>* {preferredTranscriptDescription}</p>}
       <ScrollWrapper>
         <TranscriptsTissueExpressionPlot
+          gtexTissues={gtexTissues}
           tissues={tissues}
-          transcripts={renderedTranscripts}
+          transcripts={renderedTranscripts as TranscriptWithTissueExpression[]}
           starredTranscriptId={preferredTranscriptId}
         />
       </ScrollWrapper>
diff --git a/browser/src/GenePage/TranscriptsTissueExpressionPlot.tsx b/browser/src/GenePage/TranscriptsTissueExpressionPlot.tsx
index d353e46a0..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 { GTEX_TISSUE_NAMES } from '../gtex'
+import { TranscriptWithTissueExpression } from './TissueExpressionTrack'
+import { GtexTissueName, GtexTissues } from '../gtex'
 
 const mergeOverlappingRegions = (regions: any) => {
   if (regions.length === 0) {
@@ -120,49 +120,47 @@ const margin = {
   top: 45,
 }
 
-type OwnTranscriptsTissueExpressionPlotProps = {
-  tissues?: string[]
-  transcripts: {
-    transcript_id: string
-    transcript_version: string
-    gtex_tissue_expression: {
-      [key: string]: number
-    }
-  }[]
+type TranscriptsTissueExpressionPlotProps = {
+  gtexTissues: Partial<GtexTissues>
+  tissues?: GtexTissueName[]
+  transcripts: TranscriptWithTissueExpression[]
   starredTranscriptId?: string
 }
 
-// @ts-expect-error TS(2456) FIXME: Type alias 'TranscriptsTissueExpressionPlotProps' ... Remove this comment to see the full error message
-type TranscriptsTissueExpressionPlotProps = OwnTranscriptsTissueExpressionPlotProps &
-  typeof TranscriptsTissueExpressionPlot.defaultProps
-
-// @ts-expect-error TS(7022) FIXME: 'TranscriptsTissueExpressionPlot' implicitly has t... Remove this comment to see the full error message
 const TranscriptsTissueExpressionPlot = ({
+  gtexTissues,
   tissues,
   transcripts,
   starredTranscriptId,
 }: TranscriptsTissueExpressionPlotProps) => {
-  const renderedTissues = ['Mean', 'Median', ...tissues]
+  type RenderedTissue = GtexTissueName | 'Mean' | 'Median'
+  const renderedTissues: RenderedTissue[] = ['Mean', 'Median', ...tissues!]
+
+  const transcriptsWithMeanAndMedianExpression = transcripts.map((transcript) => {
+    const gtexTissueExpressionObject: { [key: string]: number } =
+      transcript.gtex_tissue_expression.reduce((acc, tissue) => {
+        acc[tissue.tissue] = tissue.value
+        return acc
+      }, {} as Record<string, number>)
+
+    const expressionValues = transcript.gtex_tissue_expression.map((tissue) => tissue.value)
 
-  const transcriptsWithMeanAndMedianExpresion = transcripts.map((transcript: any) => {
-    const expressionValues = Object.values(transcript.gtex_tissue_expression)
     return {
       ...transcript,
       gtex_tissue_expression: {
-        ...transcript.gtex_tissue_expression,
-        // @ts-expect-error TS(2345) FIXME: Argument of type 'unknown[]' is not assignable to ... Remove this comment to see the full error message
+        ...(gtexTissueExpressionObject as Partial<Record<GtexTissueName, number>>),
         Mean: mean(expressionValues),
-        // @ts-expect-error TS(2345) FIXME: Argument of type 'unknown[]' is not assignable to ... Remove this comment to see the full error message
         Median: median(expressionValues),
       },
     }
   })
 
   const maxTissueExpression = max(
-    transcripts.flatMap((transcript: any) => Object.values(transcript.gtex_tissue_expression))
-  )
+    transcripts.flatMap((transcript) =>
+      transcript.gtex_tissue_expression.map((tissue) => tissue.value)
+    )
+  )!
 
-  // @ts-expect-error TS(2345) FIXME: Argument of type '(string | number | undefined)[]'... Remove this comment to see the full error message
   const opacityScale = scaleLinear().domain([0, maxTissueExpression]).range([0, 1])
 
   const transcriptsWidth = 150
@@ -185,8 +183,7 @@ const TranscriptsTissueExpressionPlot = ({
     .domain(renderedTissues)
     .range([
       ...renderedTissues.slice(0, 2).map(baseXScale),
-      // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
-      ...renderedTissues.slice(2).map((tissueId) => baseXScale(tissueId) + gutterWidth),
+      ...renderedTissues.slice(2).map((tissueId) => baseXScale(tissueId)! + gutterWidth),
     ])
 
   const xAxisScale = scaleOrdinal()
@@ -194,14 +191,12 @@ const TranscriptsTissueExpressionPlot = ({
     .range(
       [
         ...renderedTissues.slice(0, 2).map(baseXScale),
-        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
-        ...renderedTissues.slice(2).map((tissueId) => baseXScale(tissueId) + gutterWidth),
-        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
-      ].map((x) => x + xBandWidth / 2)
+        ...renderedTissues.slice(2).map((tissueId) => baseXScale(tissueId)! + gutterWidth),
+      ].map((x) => x! + xBandWidth / 2)
     )
 
   const yScale = scaleBand()
-    .domain(transcriptsWithMeanAndMedianExpresion.map((t: any) => t.transcript_id))
+    .domain(transcriptsWithMeanAndMedianExpression.map((transcript) => transcript.transcript_id))
     .range([0, plotHeight])
     .padding(padding)
 
@@ -209,8 +204,7 @@ const TranscriptsTissueExpressionPlot = ({
 
   const halfYPadding = (yScale.step() * yScale.paddingInner()) / 2
 
-  const transcriptLabels = transcripts.reduce(
-    // @ts-expect-error TS(7006) FIXME: Parameter 'acc' implicitly has an 'any' type.
+  const transcriptLabels: { [key: string]: string } = transcripts.reduce(
     (acc, transcript) => ({
       ...acc,
       [transcript.transcript_id]: `${transcript.transcript_id}.${transcript.transcript_version}`,
@@ -236,14 +230,12 @@ const TranscriptsTissueExpressionPlot = ({
         </text>
         <rect x={10} y={0} height={14} width={60} fill="url(#expression-gradient)" />
         <text x={70} y={7} dx="0.25em" dy="0.25em" fontSize={10} textAnchor="start">
-          {/* @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'. */}
           {maxTissueExpression.toPrecision(4)}
         </text>
       </g>
 
-      {transcripts.slice(1).map((transcript: any) => {
-        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
-        const y = margin.top + yScale(transcript.transcript_id) - halfYPadding
+      {transcripts.slice(1).map((transcript) => {
+        const y = margin.top + yScale(transcript.transcript_id)! - halfYPadding
 
         return (
           <line
@@ -287,21 +279,23 @@ 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"
-        // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-        tickFormat={(t) => GTEX_TISSUE_NAMES[t] || t}
+        tickFormat={(tissue: GtexTissueName) => {
+          return gtexTissues[tissue] ? gtexTissues[tissue]!.fullName : tissue
+        }}
         tickLabelProps={(value) => ({
           dx: '-0.25em',
           dy: '0.25em',
           fill: '#000',
           fontSize: 10,
           textAnchor: 'end',
-          // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-          transform: `translate(0, 0), rotate(-40 ${xScale(value) + xBandWidth / 2}, 0)`,
+          transform: `translate(0, 0), rotate(-40 ${
+            (xScale(value) as number) + xBandWidth / 2
+          }, 0)`,
         })}
         tickLength={3}
       />
       <g transform={`translate(${margin.left},${margin.top})`}>
-        {transcriptsWithMeanAndMedianExpresion.map((transcript: any) => (
+        {transcriptsWithMeanAndMedianExpression.map((transcript) => (
           <g
             key={transcript.transcript_id}
             transform={`translate(0, ${yScale(transcript.transcript_id)})`}
@@ -311,14 +305,13 @@ const TranscriptsTissueExpressionPlot = ({
               if (tissueId === 'Mean' || tissueId === 'Median') {
                 tooltipText = `${
                   transcript.transcript_id
-                } ${tissueId} expression: ${transcript.gtex_tissue_expression[tissueId].toFixed(
+                } ${tissueId} expression: ${transcript.gtex_tissue_expression[tissueId]!.toFixed(
                   2
                 )} TPM`
               } else {
                 tooltipText = `${transcript.transcript_id} expression in ${
-                  // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-                  GTEX_TISSUE_NAMES[tissueId]
-                } tissues: ${transcript.gtex_tissue_expression[tissueId].toFixed(2)} TPM`
+                  gtexTissues[tissueId]!.fullName
+                } tissues: ${transcript.gtex_tissue_expression[tissueId]!.toFixed(2)} TPM`
               }
 
               return (
@@ -331,7 +324,7 @@ const TranscriptsTissueExpressionPlot = ({
                     height={yBandWidth - 2}
                     rx={3}
                     fill="#3f007d"
-                    opacity={opacityScale(transcript.gtex_tissue_expression[tissueId])}
+                    opacity={opacityScale(transcript.gtex_tissue_expression[tissueId]!)}
                   />
                   {/* @ts-expect-error TS(2322) FIXME: Type '{ children: Element; key: any; tooltip: stri... Remove this comment to see the full error message */}
                   <TooltipAnchor key={tissueId} tooltip={tooltipText}>
@@ -361,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/GenePage/VariantsInGene.tsx b/browser/src/GenePage/VariantsInGene.tsx
index 7a727aad4..da367cf91 100644
--- a/browser/src/GenePage/VariantsInGene.tsx
+++ b/browser/src/GenePage/VariantsInGene.tsx
@@ -11,6 +11,7 @@ import filterVariantsInZoomRegion from '../RegionViewer/filterVariantsInZoomRegi
 import { TrackPageSection } from '../TrackPage'
 import annotateVariantsWithClinvar from '../VariantList/annotateVariantsWithClinvar'
 import Variants from '../VariantList/Variants'
+import { Pext } from './GenePage'
 
 type TranscriptsModalProps = {
   gene: {
@@ -326,18 +327,9 @@ type ConnectedVariantsInGeneProps = {
   datasetId: DatasetId
   gene: {
     gene_id: string
-    pext?: {
-      regions: {
-        start: number
-        stop: number
-        mean: number
-        tissues: {
-          [key: string]: number
-        }
-      }[]
-    }
+    pext?: Pext
   }
-}
+} & VariantsInGeneProps
 
 const ConnectedVariantsInGene = ({
   datasetId,
diff --git a/browser/src/GenePage/sortedTranscripts.ts b/browser/src/GenePage/sortedTranscripts.ts
index f0e825e8b..59ff69f7f 100644
--- a/browser/src/GenePage/sortedTranscripts.ts
+++ b/browser/src/GenePage/sortedTranscripts.ts
@@ -1,24 +1,38 @@
 import { mean } from 'd3-array'
 
-const sortedTranscripts = (transcripts: any, firstTranscriptId: any) => {
+interface GenericTranscript {
+  transcript_id: string
+  gtex_tissue_expression:
+    | {
+        tissue: string
+        value: number
+      }[]
+    | null
+}
+
+const sortedTranscripts = (
+  transcripts: GenericTranscript[],
+  firstTranscriptId: string | undefined
+) => {
   return [...transcripts].sort((t1, t2) => {
     // Sort specified transcript first
     // Then sort transcripts by mean expression and transcript ID
-    if (t1.transcript_id === firstTranscriptId) {
-      return -1
-    }
-    if (t2.transcript_id === firstTranscriptId) {
-      return 1
+
+    if (firstTranscriptId) {
+      if (t1.transcript_id === firstTranscriptId) {
+        return -1
+      }
+      if (t2.transcript_id === firstTranscriptId) {
+        return 1
+      }
     }
 
-    const t1Mean = mean(Object.values(t1.gtex_tissue_expression || {}))
-    const t2Mean = mean(Object.values(t2.gtex_tissue_expression || {}))
+    const t1Mean = mean(t1.gtex_tissue_expression!.map((tissue) => tissue.value)) || 0
+    const t2Mean = mean(t2.gtex_tissue_expression!.map((tissue) => tissue.value)) || 0
 
     if (t1Mean === t2Mean) {
       return t1.transcript_id.localeCompare(t2.transcript_id)
     }
-
-    // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
     return t2Mean - t1Mean
   })
 }
diff --git a/browser/src/__factories__/TissueExpression.tsx b/browser/src/__factories__/TissueExpression.tsx
index 128cd11bb..ea6eecaa0 100644
--- a/browser/src/__factories__/TissueExpression.tsx
+++ b/browser/src/__factories__/TissueExpression.tsx
@@ -2,114 +2,68 @@ import { Factory } from 'fishery'
 import { GtexTissueExpression } from '../GenePage/TranscriptsTissueExpression'
 
 export const gtexTissueExpressionFactory = Factory.define<GtexTissueExpression>(({ params }) => {
-  const {
-    adipose_subcutaneous = 0,
-    adipose_visceral_omentum = 0,
-    adrenal_gland = 0,
-    artery_aorta = 0,
-    artery_coronary = 0,
-    artery_tibial = 0,
-    bladder = 0,
-    brain_amygdala = 0,
-    brain_anterior_cingulate_cortex_ba24 = 0,
-    brain_caudate_basal_ganglia = 0,
-    brain_cerebellar_hemisphere = 0,
-    brain_cerebellum = 0,
-    brain_cortex = 0,
-    brain_frontal_cortex_ba9 = 0,
-    brain_hippocampus = 0,
-    brain_hypothalamus = 0,
-    brain_nucleus_accumbens_basal_ganglia = 0,
-    brain_putamen_basal_ganglia = 0,
-    brain_spinal_cord_cervical_c_1 = 0,
-    brain_substantia_nigra = 0,
-    breast_mammary_tissue = 0,
-    cells_ebv_transformed_lymphocytes = 0,
-    cells_transformed_fibroblasts = 0,
-    cervix_ectocervix = 0,
-    cervix_endocervix = 0,
-    colon_sigmoid = 0,
-    colon_transverse = 0,
-    esophagus_gastroesophageal_junction = 0,
-    esophagus_mucosa = 0,
-    esophagus_muscularis = 0,
-    fallopian_tube = 0,
-    heart_atrial_appendage = 0,
-    heart_left_ventricle = 0,
-    kidney_cortex = 0,
-    liver = 0,
-    lung = 0,
-    minor_salivary_gland = 0,
-    muscle_skeletal = 0,
-    nerve_tibial = 0,
-    ovary = 0,
-    pancreas = 0,
-    pituitary = 0,
-    prostate = 0,
-    skin_not_sun_exposed_suprapubic = 0,
-    skin_sun_exposed_lower_leg = 0,
-    small_intestine_terminal_ileum = 0,
-    spleen = 0,
-    stomach = 0,
-    testis = 0,
-    thyroid = 0,
-    uterus = 0,
-    vagina = 0,
-    whole_blood = 0,
-  } = params
-  return {
-    adipose_subcutaneous,
-    adipose_visceral_omentum,
-    adrenal_gland,
-    artery_aorta,
-    artery_coronary,
-    artery_tibial,
-    bladder,
-    brain_amygdala,
-    brain_anterior_cingulate_cortex_ba24,
-    brain_caudate_basal_ganglia,
-    brain_cerebellar_hemisphere,
-    brain_cerebellum,
-    brain_cortex,
-    brain_frontal_cortex_ba9,
-    brain_hippocampus,
-    brain_hypothalamus,
-    brain_nucleus_accumbens_basal_ganglia,
-    brain_putamen_basal_ganglia,
-    brain_spinal_cord_cervical_c_1,
-    brain_substantia_nigra,
-    breast_mammary_tissue,
-    cells_ebv_transformed_lymphocytes,
-    cells_transformed_fibroblasts,
-    cervix_ectocervix,
-    cervix_endocervix,
-    colon_sigmoid,
-    colon_transverse,
-    esophagus_gastroesophageal_junction,
-    esophagus_mucosa,
-    esophagus_muscularis,
-    fallopian_tube,
-    heart_atrial_appendage,
-    heart_left_ventricle,
-    kidney_cortex,
-    liver,
-    lung,
-    minor_salivary_gland,
-    muscle_skeletal,
-    nerve_tibial,
-    ovary,
-    pancreas,
-    pituitary,
-    prostate,
-    skin_not_sun_exposed_suprapubic,
-    skin_sun_exposed_lower_leg,
-    small_intestine_terminal_ileum,
-    spleen,
-    stomach,
-    testis,
-    thyroid,
-    uterus,
-    vagina,
-    whole_blood,
+  const defaultTissues = {
+    adipose_subcutaneous: 0,
+    adipose_visceral_omentum: 0,
+    adrenal_gland: 0,
+    artery_aorta: 0,
+    artery_coronary: 0,
+    artery_tibial: 0,
+    bladder: 0,
+    brain_amygdala: 0,
+    brain_anterior_cingulate_cortex_ba24: 0,
+    brain_caudate_basal_ganglia: 0,
+    brain_cerebellar_hemisphere: 0,
+    brain_cerebellum: 0,
+    brain_cortex: 0,
+    brain_frontal_cortex_ba9: 0,
+    brain_hippocampus: 0,
+    brain_hypothalamus: 0,
+    brain_nucleus_accumbens_basal_ganglia: 0,
+    brain_putamen_basal_ganglia: 0,
+    brain_spinal_cord_cervical_c_1: 0,
+    brain_substantia_nigra: 0,
+    breast_mammary_tissue: 0,
+    cells_ebv_transformed_lymphocytes: 0,
+    cells_transformed_fibroblasts: 0,
+    cervix_ectocervix: 0,
+    cervix_endocervix: 0,
+    colon_sigmoid: 0,
+    colon_transverse: 0,
+    esophagus_gastroesophageal_junction: 0,
+    esophagus_mucosa: 0,
+    esophagus_muscularis: 0,
+    fallopian_tube: 0,
+    heart_atrial_appendage: 0,
+    heart_left_ventricle: 0,
+    kidney_cortex: 0,
+    liver: 0,
+    lung: 0,
+    minor_salivary_gland: 0,
+    muscle_skeletal: 0,
+    nerve_tibial: 0,
+    ovary: 0,
+    pancreas: 0,
+    pituitary: 0,
+    prostate: 0,
+    skin_not_sun_exposed_suprapubic: 0,
+    skin_sun_exposed_lower_leg: 0,
+    small_intestine_terminal_ileum: 0,
+    spleen: 0,
+    stomach: 0,
+    testis: 0,
+    thyroid: 0,
+    uterus: 0,
+    vagina: 0,
+    whole_blood: 0,
   }
+
+  const tissueObject = { ...defaultTissues, ...params } as typeof defaultTissues
+
+  const tissueArray: GtexTissueExpression = Object.entries(tissueObject).map((entry) => ({
+    tissue: entry[0],
+    value: entry[1],
+  }))
+
+  return tissueArray
 })
diff --git a/browser/src/gtex.ts b/browser/src/gtex.ts
index c2e957dc2..c439932cb 100644
--- a/browser/src/gtex.ts
+++ b/browser/src/gtex.ts
@@ -1,111 +1,242 @@
-export const GTEX_TISSUE_NAMES = {
-  adipose_subcutaneous: 'Adipose - Subcutaneous',
-  adipose_visceral_omentum: 'Adipose - Visceral (Omentum)',
-  adrenal_gland: 'Adrenal Gland',
-  artery_aorta: 'Artery - Aorta',
-  artery_coronary: 'Artery - Coronary',
-  artery_tibial: 'Artery - Tibial',
-  bladder: 'Bladder',
-  brain_amygdala: 'Brain - Amygdala',
-  brain_anterior_cingulate_cortex_ba24: 'Brain - Anterior cingulate cortex (BA24)',
-  brain_caudate_basal_ganglia: 'Brain - Caudate (basal ganglia)',
-  brain_cerebellar_hemisphere: 'Brain - Cerebellar Hemisphere',
-  brain_cerebellum: 'Brain - Cerebellum',
-  brain_cortex: 'Brain - Cortex',
-  brain_frontal_cortex_ba9: 'Brain - Frontal Cortex (BA9)',
-  brain_hippocampus: 'Brain - Hippocampus',
-  brain_hypothalamus: 'Brain - Hypothalamus',
-  brain_nucleus_accumbens_basal_ganglia: 'Brain - Nucleus accumbens (basal ganglia)',
-  brain_putamen_basal_ganglia: 'Brain - Putamen (basal ganglia)',
-  brain_spinal_cord_cervical_c_1: 'Brain - Spinal cord (cervical c-1)',
-  brain_substantia_nigra: 'Brain - Substantia nigra',
-  breast_mammary_tissue: 'Breast - Mammary Tissue',
-  cells_ebv_transformed_lymphocytes: 'Cells - EBV-transformed lymphocytes',
-  cells_transformed_fibroblasts: 'Cells - Transformed fibroblasts',
-  cervix_ectocervix: 'Cervix - Ectocervix',
-  cervix_endocervix: 'Cervix - Endocervix',
-  colon_sigmoid: 'Colon - Sigmoid',
-  colon_transverse: 'Colon - Transverse',
-  esophagus_gastroesophageal_junction: 'Esophagus - Gastroesophageal Junction',
-  esophagus_mucosa: 'Esophagus - Mucosa',
-  esophagus_muscularis: 'Esophagus - Muscularis',
-  fallopian_tube: 'Fallopian Tube',
-  heart_atrial_appendage: 'Heart - Atrial Appendage',
-  heart_left_ventricle: 'Heart - Left Ventricle',
-  kidney_cortex: 'Kidney - Cortex',
-  liver: 'Liver',
-  lung: 'Lung',
-  minor_salivary_gland: 'Minor Salivary Gland',
-  muscle_skeletal: 'Muscle - Skeletal',
-  nerve_tibial: 'Nerve - Tibial',
-  ovary: 'Ovary',
-  pancreas: 'Pancreas',
-  pituitary: 'Pituitary',
-  prostate: 'Prostate',
-  skin_not_sun_exposed_suprapubic: 'Skin - Not Sun Exposed (Suprapubic)',
-  skin_sun_exposed_lower_leg: 'Skin - Sun Exposed (Lower leg)',
-  small_intestine_terminal_ileum: 'Small Intestine - Terminal Ileum',
-  spleen: 'Spleen',
-  stomach: 'Stomach',
-  testis: 'Testis',
-  thyroid: 'Thyroid',
-  uterus: 'Uterus',
-  vagina: 'Vagina',
-  whole_blood: 'Whole Blood',
+const SHARED_GTEX_TISSUES = {
+  adipose_subcutaneous: {
+    fullName: 'Adipose - Subcutaneous',
+    color: '#FF6600',
+  },
+  adipose_visceral_omentum: {
+    fullName: 'Adipose - Visceral (Omentum)',
+    color: '#FFAA00',
+  },
+  adrenal_gland: {
+    fullName: 'Adrenal Gland',
+    color: '#33DD33',
+  },
+  artery_aorta: {
+    fullName: 'Artery - Aorta',
+    color: '#FF5555',
+  },
+  artery_coronary: {
+    fullName: 'Artery - Coronary',
+    color: '#FFAA99',
+  },
+  artery_tibial: {
+    fullName: 'Artery - Tibial',
+    color: '#FF0000',
+  },
+  brain_amygdala: {
+    fullName: 'Brain - Amygdala',
+    color: '#EEEE00',
+  },
+  brain_anterior_cingulate_cortex_ba24: {
+    fullName: 'Brain - Anterior cingulate cortex (BA24)',
+    color: '#EEEE00',
+  },
+  brain_caudate_basal_ganglia: {
+    fullName: 'Brain - Caudate (basal ganglia)',
+    color: '#EEEE00',
+  },
+  brain_cerebellar_hemisphere: {
+    fullName: 'Brain - Cerebellar Hemisphere',
+    color: '#EEEE00',
+  },
+  brain_cerebellum: {
+    fullName: 'Brain - Cerebellum',
+    color: '#EEEE00',
+  },
+  brain_cortex: {
+    fullName: 'Brain - Cortex',
+    color: '#EEEE00',
+  },
+  brain_frontal_cortex_ba9: {
+    fullName: 'Brain - Frontal Cortex (BA9)',
+    color: '#EEEE00',
+  },
+  brain_hippocampus: {
+    fullName: 'Brain - Hippocampus',
+    color: '#EEEE00',
+  },
+  brain_hypothalamus: {
+    fullName: 'Brain - Hypothalamus',
+    color: '#EEEE00',
+  },
+  brain_nucleus_accumbens_basal_ganglia: {
+    fullName: 'Brain - Nucleus accumbens (basal ganglia)',
+    color: '#EEEE00',
+  },
+  brain_putamen_basal_ganglia: {
+    fullName: 'Brain - Putamen (basal ganglia)',
+    color: '#EEEE00',
+  },
+  brain_spinal_cord_cervical_c_1: {
+    fullName: 'Brain - Spinal cord (cervical c-1)',
+    color: '#EEEE00',
+  },
+  brain_substantia_nigra: {
+    fullName: 'Brain - Substantia nigra',
+    color: '#EEEE00',
+  },
+  breast_mammary_tissue: {
+    fullName: 'Breast - Mammary Tissue',
+    color: '#33CCCC',
+  },
+  cells_ebv_transformed_lymphocytes: {
+    fullName: 'Cells - EBV-transformed lymphocytes',
+    color: '#CC66FF',
+  },
+  colon_sigmoid: {
+    fullName: 'Colon - Sigmoid',
+    color: '#EEBB77',
+  },
+  colon_transverse: {
+    fullName: 'Colon - Transverse',
+    color: '#CC9955',
+  },
+  esophagus_gastroesophageal_junction: {
+    fullName: 'Esophagus - Gastroesophageal Junction',
+    color: '#8B7355',
+  },
+  esophagus_mucosa: {
+    fullName: 'Esophagus - Mucosa',
+    color: '#552200',
+  },
+  esophagus_muscularis: {
+    fullName: 'Esophagus - Muscularis',
+    color: '#BB9988',
+  },
+  heart_atrial_appendage: {
+    fullName: 'Heart - Atrial Appendage',
+    color: '#9900FF',
+  },
+  heart_left_ventricle: {
+    fullName: 'Heart - Left Ventricle',
+    color: '#660099',
+  },
+  kidney_cortex: {
+    fullName: 'Kidney - Cortex',
+    color: '#22FFDD',
+  },
+  liver: {
+    fullName: 'Liver',
+    color: '#AABB66',
+  },
+  lung: {
+    fullName: 'Lung',
+    color: '#99FF00',
+  },
+  minor_salivary_gland: {
+    fullName: 'Minor Salivary Gland',
+    color: '#99BB88',
+  },
+  muscle_skeletal: {
+    fullName: 'Muscle - Skeletal',
+    color: '#AAAAFF',
+  },
+  nerve_tibial: {
+    fullName: 'Nerve - Tibial',
+    color: '#FFD700',
+  },
+  ovary: {
+    fullName: 'Ovary',
+    color: '#FFAAFF',
+  },
+  pancreas: {
+    fullName: 'Pancreas',
+    color: '#995522',
+  },
+  pituitary: {
+    fullName: 'Pituitary',
+    color: '#AAFF99',
+  },
+  prostate: {
+    fullName: 'Prostate',
+    color: '#DDDDDD',
+  },
+  skin_not_sun_exposed_suprapubic: {
+    fullName: 'Skin - Not Sun Exposed (Suprapubic)',
+    color: '#0000FF',
+  },
+  skin_sun_exposed_lower_leg: {
+    fullName: 'Skin - Sun Exposed (Lower leg)',
+    color: '#7777FF',
+  },
+  small_intestine_terminal_ileum: {
+    fullName: 'Small Intestine - Terminal Ileum',
+    color: '#555522',
+  },
+  spleen: {
+    fullName: 'Spleen',
+    color: '#778855',
+  },
+  stomach: {
+    fullName: 'Stomach',
+    color: '#FFDD99',
+  },
+  testis: {
+    fullName: 'Testis',
+    color: '#AAAAAA',
+  },
+  thyroid: {
+    fullName: 'Thyroid',
+    color: '#006600',
+  },
+  uterus: {
+    fullName: 'Uterus',
+    color: '#FF66FF',
+  },
+  vagina: {
+    fullName: 'Vagina',
+    color: '#FF5599',
+  },
+  whole_blood: {
+    fullName: 'Whole Blood',
+    color: '#FF00BB',
+  },
 }
 
-export const GTEX_TISSUE_COLORS = {
-  adipose_subcutaneous: '#FF6600',
-  adipose_visceral_omentum: '#FFAA00',
-  adrenal_gland: '#33DD33',
-  artery_aorta: '#FF5555',
-  artery_coronary: '#FFAA99',
-  artery_tibial: '#FF0000',
-  bladder: '#AA0000',
-  brain_amygdala: '#EEEE00',
-  brain_anterior_cingulate_cortex_ba24: '#EEEE00',
-  brain_caudate_basal_ganglia: '#EEEE00',
-  brain_cerebellar_hemisphere: '#EEEE00',
-  brain_cerebellum: '#EEEE00',
-  brain_cortex: '#EEEE00',
-  brain_frontal_cortex_ba9: '#EEEE00',
-  brain_hippocampus: '#EEEE00',
-  brain_hypothalamus: '#EEEE00',
-  brain_nucleus_accumbens_basal_ganglia: '#EEEE00',
-  brain_putamen_basal_ganglia: '#EEEE00',
-  brain_spinal_cord_cervical_c_1: '#EEEE00',
-  brain_substantia_nigra: '#EEEE00',
-  breast_mammary_tissue: '#33CCCC',
-  cells_ebv_transformed_lymphocytes: '#CC66FF',
-  cells_transformed_fibroblasts: '#AAEEFF',
-  cervix_ectocervix: '#FFCCCC',
-  cervix_endocervix: '#CCAADD',
-  colon_sigmoid: '#EEBB77',
-  colon_transverse: '#CC9955',
-  esophagus_gastroesophageal_junction: '#8B7355',
-  esophagus_mucosa: '#552200',
-  esophagus_muscularis: '#BB9988',
-  fallopian_tube: '#FFCCCC',
-  heart_atrial_appendage: '#9900FF',
-  heart_left_ventricle: '#660099',
-  kidney_cortex: '#22FFDD',
-  liver: '#AABB66',
-  lung: '#99FF00',
-  minor_salivary_gland: '#99BB88',
-  muscle_skeletal: '#AAAAFF',
-  nerve_tibial: '#FFD700',
-  ovary: '#FFAAFF',
-  pancreas: '#995522',
-  pituitary: '#AAFF99',
-  prostate: '#DDDDDD',
-  skin_not_sun_exposed_suprapubic: '#0000FF',
-  skin_sun_exposed_lower_leg: '#7777FF',
-  small_intestine_terminal_ileum: '#555522',
-  spleen: '#778855',
-  stomach: '#FFDD99',
-  testis: '#AAAAAA',
-  thyroid: '#006600',
-  uterus: '#FF66FF',
-  vagina: '#FF5599',
-  whole_blood: '#FF00BB',
+const V2_SPECIFIC_GTEX_TISSUES = {
+  bladder: {
+    fullName: 'Bladder',
+    color: '#AA0000',
+  },
+  cells_transformed_fibroblasts: {
+    fullName: 'Cells - Transformed fibroblasts',
+    color: '#AAEEFF',
+  },
+  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 = {
+  cells_cultured_fibroblasts: {
+    fullName: 'Cells - Cultured fibroblasts',
+    color: '#AAEEFF',
+  },
+}
+
+export type GtexTissueName =
+  | keyof typeof SHARED_GTEX_TISSUES
+  | keyof typeof V2_SPECIFIC_GTEX_TISSUES
+  | keyof typeof V4_SPECIFIC_GTEX_TISSUES
+
+export type TissueDetail = {
+  fullName: string
+  color: string
+}
+
+export type GtexTissues = Record<GtexTissueName, TissueDetail>
+
+export const ALL_GTEX_TISSUES: GtexTissues = {
+  ...SHARED_GTEX_TISSUES,
+  ...V2_SPECIFIC_GTEX_TISSUES,
+  ...V4_SPECIFIC_GTEX_TISSUES,
 }