diff --git a/gall.info.yml b/gall.info.yml
index 66f8c55..496476f 100644
--- a/gall.info.yml
+++ b/gall.info.yml
@@ -2,7 +2,7 @@ name: Gallery Guide
 type: theme
 description: Gallery Guide theme
 package: Other
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9 || ^10
 libraries:
   - gall/global
 
diff --git a/gall.theme b/gall.theme
index 7b4091f..e1ea1a0 100644
--- a/gall.theme
+++ b/gall.theme
@@ -55,7 +55,8 @@ function gall_page_attachments_alter(array &$page) {
  * Implements hook_preprocess_page() for PAGE document templates.
  */
 function gall_preprocess_page(&$variables) {
-  $svg = file_get_contents(drupal_get_path('theme', 'gall') . '/images/icons.svg');
+  $theme_path = \Drupal::service('extension.list.theme')->getPath('gall');
+  $svg = file_get_contents($theme_path . '/images/icons.svg');
   $variables['svg_icons'] = $svg;
 }
 
diff --git a/templates/nodes/node--exhibition--full.html.twig b/templates/nodes/node--exhibition--full.html.twig
index 5fd0143..db7917f 100644
--- a/templates/nodes/node--exhibition--full.html.twig
+++ b/templates/nodes/node--exhibition--full.html.twig
@@ -106,7 +106,7 @@
     </div>
 
     <div class="exhibition__body">
-      {{ content.field_rating }}
+      {{ content.rate_fivestar }}
       {{ content.body }}
     </div>
 
@@ -119,5 +119,6 @@
       <a href="/user/login?destination=node/{{ node.id }}">{{ 'Log in or register to edit this exhibition' }}</a>
     {% endif %}
   </div>
+  {{ content|without('rate_fivestar','body','field_exhib_gallery','field_images','artists','tags', 'field_admission_std', 'field_admission_conc', 'field_exhib_website', 'field_date_from', 'field_date_to') }}
 
-</article>
\ No newline at end of file
+</article>
diff --git a/templates/nodes/node--gallery--full.html.twig b/templates/nodes/node--gallery--full.html.twig
index 2c16aa4..a225fc5 100644
--- a/templates/nodes/node--gallery--full.html.twig
+++ b/templates/nodes/node--gallery--full.html.twig
@@ -112,7 +112,7 @@
      {{ content.body }}
 
       <div class="gallery__map">
-        {{ content.field_rating }}
+        {{ content.rate_fivestar }}
         {{ content.field_location }}
       </div>
     </div>
@@ -126,4 +126,6 @@
       {% endif %}
     </div>
   </div>
+
+  {{ content|without('rate_fivestar','body','field_exhib_gallery','field_images','artists','tags', 'field_admission_std', 'field_admission_conc', 'field_exhib_website', 'field_date_from', 'field_date_to') }}
 </article>
diff --git a/templates/terms/taxonomy-term--artists.html.twig b/templates/terms/taxonomy-term--artists.html.twig
index d8e792b..a074242 100644
--- a/templates/terms/taxonomy-term--artists.html.twig
+++ b/templates/terms/taxonomy-term--artists.html.twig
@@ -39,14 +39,17 @@
     {{ content.field_image }}
 
     <div class="artist__bio">
+      {{ content.rate_fivestar }}
       {{ content.description }}
 
       {{ content.field_born }}
       {{ content.field_died }}
-      
+
       {{ content.field_website }}
 
       {{ content.field_tags }}
     </div>
   </div>
+
+  {{ content }}
 </div>