diff --git a/ui/apps/platform/src/Components/CodeViewer.cy.jsx b/ui/apps/platform/src/Components/CodeViewer.cy.jsx
index 9457d6d90c8ac..8e65d9c97e409 100644
--- a/ui/apps/platform/src/Components/CodeViewer.cy.jsx
+++ b/ui/apps/platform/src/Components/CodeViewer.cy.jsx
@@ -42,13 +42,16 @@ describe(Cypress.spec.relative, () => {
         cy.mount(<CodeViewer code={sampleYaml} />);
 
         // Default to light mode
-        cy.get('.pf-v5-theme-dark').should('not.exist');
+        cy.get('[data-component-theme="light"]').should('exist');
+        cy.get('[data-component-theme="dark"]').should('not.exist');
 
         cy.get('button[aria-label="Set dark theme"]').click();
-        cy.get('.pf-v5-theme-dark');
+        cy.get('[data-component-theme="light"]').should('not.exist');
+        cy.get('[data-component-theme="dark"]').should('exist');
 
         cy.get('button[aria-label="Set light theme"]').click();
-        cy.get('.pf-v5-theme-dark').should('not.exist');
+        cy.get('[data-component-theme="light"]').should('exist');
+        cy.get('[data-component-theme="dark"]').should('not.exist');
     });
 
     it('should share theme state across multiple instances', () => {
@@ -59,18 +62,21 @@ describe(Cypress.spec.relative, () => {
             </CodeViewerThemeProvider>
         );
 
-        cy.get('.pf-v5-theme-dark').should('not.exist');
+        cy.get('[data-component-theme="light"]').should('have.length', 2);
+        cy.get('[data-component-theme="dark"]').should('have.length', 0);
 
         cy.get('button[aria-label="Set dark theme"]').eq(0);
         cy.get('button[aria-label="Set dark theme"]').eq(1);
         cy.get('button[aria-label="Set dark theme"]').eq(0).click();
 
-        cy.get('.pf-v5-theme-dark').should('have.length', 2);
+        cy.get('[data-component-theme="light"]').should('have.length', 0);
+        cy.get('[data-component-theme="dark"]').should('have.length', 2);
 
         cy.get('button[aria-label="Set light theme"]').eq(0);
         cy.get('button[aria-label="Set light theme"]').eq(1);
         cy.get('button[aria-label="Set light theme"]').eq(1).click();
 
-        cy.get('.pf-v5-theme-dark').should('not.exist');
+        cy.get('[data-component-theme="light"]').should('have.length', 2);
+        cy.get('[data-component-theme="dark"]').should('have.length', 0);
     });
 });
diff --git a/ui/apps/platform/src/Components/CodeViewer.tsx b/ui/apps/platform/src/Components/CodeViewer.tsx
index 8a0effec417b2..f3d1b1fb8dba4 100644
--- a/ui/apps/platform/src/Components/CodeViewer.tsx
+++ b/ui/apps/platform/src/Components/CodeViewer.tsx
@@ -45,6 +45,15 @@ const defaultStyle = {
     overflowY: 'auto',
 } as const;
 
+const lightThemeStyles = {} as const;
+
+// TODO This should be deleted when we move to proper PatternFly theming
+const darkThemeStyles = {
+    '--pf-t--global--background--color--secondary--default': 'var(--pf-t--color--gray--95)',
+    '--pf-t--global--text--color--regular': 'var(--pf-t--color--white)',
+    '--pf-t--global--icon--color--regular': 'var(--pf-t--color--white)',
+} as const;
+
 export type CodeViewerProps = {
     code: string;
     language?: SupportedLanguages;
@@ -94,11 +103,14 @@ export default function CodeViewer({
         </>
     );
 
+    const themeStyles = theme === 'light' ? lightThemeStyles : darkThemeStyles;
+
     // TODO - When Tailwind is removed, we likely need to get rid of this font size override
     return (
         <CodeBlock
-            className={`${theme === 'light' ? '' : 'pf-v5-theme-dark'} pf-v6-u-p-0 pf-v6-u-font-size-xs pf-v6-u-max-height ${className}`}
-            style={{ ...defaultStyle, ...style }}
+            data-component-theme={theme}
+            className={`pf-v6-u-p-0 pf-v6-u-font-size-xs pf-v6-u-max-height ${className}`}
+            style={{ ...defaultStyle, ...style, ...themeStyles }}
             actions={actions}
         >
             <SyntaxHighlighter
diff --git a/ui/apps/platform/src/app.tw.css b/ui/apps/platform/src/app.tw.css
index 182fcd455e143..00baa91e51bd8 100644
--- a/ui/apps/platform/src/app.tw.css
+++ b/ui/apps/platform/src/app.tw.css
@@ -7,7 +7,6 @@
 @import 'css/style.css';
 
 @import 'css/light.theme.css';
-@import 'css/dark.theme.css';
 
 /* React Table overrides. Delete this file once all react Table properties are ported over properly to avoid the use of !important*/
 @import 'react-table-6/react-table.css';
@@ -16,12 +15,6 @@
 @import 'react-vis/dist/style.css';
 
 
-.theme-dark .react-select__option:hover,
-.theme-dark .react-select__option:focus,
-.theme-dark .react-select__option:active {
-    background: var(--base-400);
-}
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
@@ -447,20 +440,6 @@ h6 {
     @apply bg-base-100 !important; /* th also needs background for horizontal scrolling beyond tr width */
 }
 
-.theme-dark .ReactTable .rt-thead.-header .rt-tr {
-    @apply border-b border-base-200 bg-base-0 !important;
-    box-shadow: -10px 0 0 var(--base-100), 10px 0 0 var(--base-100), 0 2px 8px 0 hsl(233, 25%, 15%) !important;
-}
-
-.theme-dark .ReactTable .rt-th {
-    @apply bg-base-0 !important; /* th also needs background for horizontal scrolling beyond tr width */
-}
-
-.theme-dark .widget .ReactTable .rt-thead.-header .rt-tr,
-.theme-dark .widget .ReactTable .rt-th {
-    @apply bg-base-100 !important;
-}
-
 .ReactTable .rt-thead .rt-th.-sort-desc,
 .ReactTable .rt-thead .rt-th.-sort-asc {
     @apply shadow-none !important;
diff --git a/ui/apps/platform/src/css/dark.theme.css b/ui/apps/platform/src/css/dark.theme.css
deleted file mode 100644
index 0454d29c3bcd8..0000000000000
--- a/ui/apps/platform/src/css/dark.theme.css
+++ /dev/null
@@ -1,96 +0,0 @@
-.theme-dark {
-    --base-0: hsla(0, 0%, 19%, 1);
-    --base-100: hsla(0, 0%, 23%, 1);
-    --base-200: hsla(0, 0%, 26%, 1);
-    --base-300: hsla(0, 0%, 32%, 1);
-    --base-400: hsla(0, 0%, 37%, 1);
-    --base-500: hsla(0, 0%, 63%, 1);
-    --base-600: hsla(0, 0%, 87%, 1);
-    --base-700: hsla(0, 0%, 94%, 1);
-    --base-800: hsla(0, 0%, 98%, 1);
-    --base-900: hsla(0, 0%, 100%, 1);
-
-    --primary-100: hsla(207, 28%, 21%, 1);
-    --primary-200: hsla(207, 34%, 26%, 1);
-    --primary-300: hsla(207, 36%, 40%, 1);
-    --primary-400: hsla(207, 45%, 55%, 1);
-    --primary-500: hsla(207, 65%, 60%, 1);
-    --primary-600: hsla(207, 68%, 70%, 1);
-    --primary-700: hsla(207, 80%, 80%, 1);
-    --primary-800: hsla(207, 100%, 93%, 1);
-    --primary-900: hsla(207, 100%, 99%, 1);
-
-    --secondary-100: hsla(250, 21%, 27%, 1);
-    --secondary-200: hsla(250, 18%, 36%, 1);
-    --secondary-300: hsla(250, 20%, 45%, 1);
-    --secondary-400: hsla(250, 25%, 67%, 1);
-    --secondary-500: hsla(250, 39%, 68%, 1);
-    --secondary-600: hsla(250, 48%, 78%, 1);
-    --secondary-700: hsla(250, 66%, 90%, 1);
-    --secondary-800: hsla(250, 100%, 96%, 1);
-    --secondary-900: hsla(250, 45%, 98%, 1);
-
-    --tertiary-100: hsla(210, 25%, 21%, 1);
-    --tertiary-200: hsla(210, 33%, 26%, 1);
-    --tertiary-300: hsla(210, 35%, 48%, 1);
-    --tertiary-400: hsla(210, 40%, 58%, 1);
-    --tertiary-500: hsla(210, 55%, 68%, 1);
-    --tertiary-600: hsla(210, 68%, 78%, 1);
-    --tertiary-700: hsla(210, 81%, 90%, 1);
-    --tertiary-800: hsla(210, 100%, 96%, 1);
-    --tertiary-900: hsla(210, 45%, 98%, 1);
-
-    --accent-100: hsla(293, 28%, 21%, 1);
-    --accent-200: hsla(293, 34%, 37%, 1);
-    --accent-300: hsla(293, 34%, 50%, 1);
-    --accent-400: hsla(293, 68%, 62%, 1);
-    --accent-500: hsla(293, 62%, 71%, 1);
-    --accent-600: hsla(293, 64%, 80%, 1);
-    --accent-700: hsla(293, 67%, 90%, 1);
-    --accent-800: hsla(293, 70%, 96%, 1);
-    --accent-900: hsla(293, 45%, 98%, 1);
-
-    --success-100: hsla(113, 28%, 21%, 1);
-    --success-200: hsla(113, 33%, 30%, 1);
-    --success-300: hsla(113, 62%, 37%, 1);
-    --success-400: hsla(113, 52%, 46%, 1);
-    --success-500: hsla(113, 66%, 68%, 1);
-    --success-600: hsla(113, 68%, 78%, 1);
-    --success-700: hsla(113, 81%, 80%, 1);
-    --success-800: hsla(113, 100%, 72%, 1);
-    --success-900: hsla(113, 100%, 90%, 1);
-
-    --warning-100: hsla(43, 28%, 21%, 1);
-    --warning-200: hsla(43, 22%, 51%, 1);
-    --warning-300: hsla(43, 38%, 52%, 1);
-    --warning-400: hsla(43, 50%, 66%, 1);
-    --warning-500: hsla(43, 62%, 71%, 1);
-    --warning-600: hsla(43, 64%, 80%, 1);
-    --warning-700: hsla(43, 80%, 90%, 1);
-    --warning-800: hsla(43, 100%, 96%, 1);
-    --warning-900: hsla(43, 45%, 98%, 1);
-
-    --caution-100: hsla(30, 28%, 21%, 1);
-    --caution-200: hsla(30, 37%, 36%, 1);
-    --caution-300: hsla(30, 47%, 48%, 1);
-    --caution-400: hsla(30, 50%, 65%, 1);
-    --caution-500: hsla(30, 66%, 68%, 1);
-    --caution-600: hsla(30, 68%, 78%, 1);
-    --caution-700: hsla(30, 81%, 90%, 1);
-    --caution-800: hsla(30, 100%, 96%, 1);
-    --caution-900: hsla(30, 45%, 98%, 1);
-
-    --alert-100: hsla(4, 28%, 21%, 1);
-    --alert-200: hsla(4, 37%, 36%, 1);
-    --alert-300: hsla(4, 50%, 52%, 1);
-    --alert-400: hsla(4, 55%, 67%, 1);
-    --alert-500: hsla(4, 66%, 68%, 1);
-    --alert-600: hsla(4, 68%, 78%, 1);
-    --alert-700: hsla(4, 81%, 90%, 1);
-    --alert-800: hsla(4, 100%, 96%, 1);
-    --alert-900: hsla(4, 45%, 98%, 1);
-}
-
-.theme-dark input[type='checkbox'] {
-    filter: invert(0.3);
-}
diff --git a/ui/apps/platform/src/css/trumps.css b/ui/apps/platform/src/css/trumps.css
index 525501d4c3594..aec71936f4315 100644
--- a/ui/apps/platform/src/css/trumps.css
+++ b/ui/apps/platform/src/css/trumps.css
@@ -17,11 +17,6 @@ body {
 
 /* Universal selector increases specificity of these override style rules */
 
-* .theme-dark {
-    --base-500: #aaabac;
-    --base-600: #ffffff;
-}
-
 * .theme-light {
     --base-500: var(--pf-t--color--gray--60);
     --base-600: var(--pf-t--color--gray--90);
@@ -167,12 +162,6 @@ button[data-testid="related-entity-value"]:hover,
     align-self: center;
 }
 
-/* Override filter which simulates dark background color */
-.theme-dark .pf-v6-c-table input[type='checkbox'],
-.theme-dark .pf-v6-c-check input[type='checkbox'] {
-    filter: inherit; /* replace invert(0.3) */
-}
-
 /* override width of thead checkbox so that it's not cut off when table is empty */
 .pf-v6-c-table thead tr > .pf-v6-c-table__check {
     min-width: 44px;
diff --git a/ui/apps/platform/src/services/PDFExportService.ts b/ui/apps/platform/src/services/PDFExportService.ts
index a914106c8c57f..5518ab4c43b4a 100644
--- a/ui/apps/platform/src/services/PDFExportService.ts
+++ b/ui/apps/platform/src/services/PDFExportService.ts
@@ -62,24 +62,10 @@ function createPDFBodyElement() {
  * @param {HTMLElement} element
  */
 function computeStyles(element) {
-    const isThemeDark = document.body.className.includes('theme-dark');
-
-    // if dark mode is enabled, we want to switch to light mode for exporting to PDF
-    if (isThemeDark) {
-        document.body.classList.remove('theme-dark');
-        document.body.classList.add('theme-light');
-    }
-
     computedStyleToInlineStyle(element, {
         recursive: true,
         properties: ['width', 'height', 'fill', 'style', 'class', 'stroke', 'font', 'font-size'],
     });
-
-    // if dark mode was previously enabled, we want to switch back after styles are computed
-    if (isThemeDark) {
-        document.body.classList.remove('theme-light');
-        document.body.classList.add('theme-dark');
-    }
 }
 
 /**