diff --git a/assets/styles/layout/_code.scss b/assets/styles/layout/_code.scss
index b191fc868..85aa65106 100644
--- a/assets/styles/layout/_code.scss
+++ b/assets/styles/layout/_code.scss
@@ -174,4 +174,12 @@ pre[class*="language-"] {
             background: var(--surface-700) !important;
         }
     }
+
+    &[data-p-theme^="md-"] {
+        pre[class*="language-"] {    
+            code {
+                background: var(--surface-900) !important;
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/layouts/default.vue b/layouts/default.vue
index 0bc56c254..2366d7269 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="layout-wrapper" :class="containerClass">
+    <div class="layout-wrapper" :class="containerClass" :data-p-theme="$appState.theme">
         <AppNews v-if="$appState.newsActive" />
         <AppTopBar @menubutton-click="onMenuButtonClick" @configbutton-click="onConfigButtonClick" />
         <AppConfigurator :configActive="appConfigActive" @updateConfigActive="onUpdateConfigActive" />