diff --git a/tainacan-blocksy/inc/enqueues.php b/tainacan-blocksy/inc/enqueues.php
index 420b5fd..9859092 100644
--- a/tainacan-blocksy/inc/enqueues.php
+++ b/tainacan-blocksy/inc/enqueues.php
@@ -221,8 +221,6 @@ if ( !function_exists('tainacan_blocksy_tooltip_and_modal_styles') ) {
 		$page_container_style .= '--tainacan-label-color:' . $text_color_palette['color3']['color'] . ';';
 		$page_container_style .= '--tainacan-info-color:' . $text_color_palette['color4']['color'] . ';';
 		$page_container_style .= '--tainacan-input-color:' . $text_color_palette['color5']['color'] . ';';
-
-		$page_container_style .= 'background-color: var(--tainacan-background-color, #f8f9fb);';
 			
 		$css = '	
 			body:not(.tainacan-admin-page) .tooltip,
@@ -230,6 +228,13 @@ if ( !function_exists('tainacan_blocksy_tooltip_and_modal_styles') ) {
 			body:not(.tainacan-admin-page) .tainacan-dialog {
 				' . $page_container_style . '
 			}
+			body:not(.tainacan-admin-page) .tainacan-modal .tainacan-modal-content,
+			body:not(.tainacan-admin-page) .tainacan-dialog .modal-card {
+				background-color: var(--tainacan-background-color, #f8f9fb);
+			}
+			body:not(.tainacan-admin-page) .tooltip {
+				color: var(--tainacan-primary);
+			}
 		';
 		echo '<style type="text/css" id="tainacan-tooltip-and-modal-styles">' . $css . '</style>';
 	}
diff --git a/tainacan-blocksy/inc/integration.php b/tainacan-blocksy/inc/integration.php
index cb22dd7..09edeaa 100644
--- a/tainacan-blocksy/inc/integration.php
+++ b/tainacan-blocksy/inc/integration.php
@@ -101,9 +101,9 @@ if ( !function_exists('tainacan_get_default_order_choices') ) {
 function tainacan_blocksy_render_media_gallery_above_title() {
 
     $prefix = blocksy_manager()->screen->get_prefix();
-    $page_structure_type = get_theme_mod( $prefix . '_page_structure_type', 'type-dam');
 
-    if ($page_structure_type === 'type-gtm') {
+    $page_structure_type = get_theme_mod( $prefix . '_page_structure_type', 'type-dam');
+    if ( $page_structure_type === 'type-gtm' ) {
         
         $content_style = get_theme_mod($prefix . '_content_style', 'wide');
         $extra_classes = '';