diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index c6d32366a..feef9707b 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -135,18 +135,26 @@ if ($themeHelper->isSidebarTheme()) {
 <? require_once "$docroot/plugins/dynamix/include/DefaultPageLayout/HeadInlineJS.php"; ?>
 
 <?
-foreach ($buttonPages as $button) {
-  annotate($button['file']);
-  // include page specific stylesheets (if existing)
-  $css = "/{$button['root']}/sheets/{$button['name']}";
+function includePageStylesheets($page) {
+  global $docroot, $theme;
+  $css = "/{$page['root']}/sheets/{$page['name']}";
   $css_stock = "$css.css";
   $css_theme = "$css-$theme.css"; // @todo add syslog for deprecation notice
   if (is_file($docroot.$css_stock)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_stock),'">',"\n";
   if (is_file($docroot.$css_theme)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_theme),'">',"\n";
-  // create page content
+}
+
+foreach ($buttonPages as $button) {
+  annotate($button['file']);
+  includePageStylesheets($button);
   eval('?>'.parse_text($button['text']));
 }
 
+foreach ($pages as $page) {
+  annotate($page['file']);
+  includePageStylesheets($page);
+}
+
 // Reload page every X minutes during extended viewing?
 if (isset($myPage['Load'])) {
     echo generateReloadScript($myPage['Load']);
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContent.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContent.php
index a0da8c741..20e32b70f 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContent.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContent.php
@@ -46,12 +46,6 @@ foreach ($pages as $page) {
     }
   }
   annotate($page['file']);
-  // include page specific stylesheets (if existing)
-  $css = "/{$page['root']}/sheets/{$page['name']}";
-  $css_stock = "$css.css";
-  $css_theme = "$css-$theme.css";
-  if (is_file($docroot.$css_stock)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_stock),'">',"\n";
-  if (is_file($docroot.$css_theme)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_theme),'">',"\n";
   // create page content
   empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));
   if ($close) echo "</div></div>";