diff --git a/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig b/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig
index fa3c6a6a..4545c387 100644
--- a/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig
+++ b/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig
@@ -21,14 +21,14 @@
 
     {% if level == 0 %}
 
-        {{ _self.field(key, '', level, _context, true, (is_numeric(key) ? true : false)) }}
+        {{ macro.field(key, '', level, _context, true, (is_numeric(key) ? true : false)) }}
 
         {% if content is not iterable %}
             {% set level2 = level + 1 %}
 
             <div class="children-wrapper">
                 <div class="element-wrapper">
-                    {{ _self.field(content, '[' ~ key ~ ']', level2, _context) }}
+                    {{ macro.field(content, '[' ~ key ~ ']', level2, _context) }}
                 </div>
             </div>
         {% endif %}
@@ -44,9 +44,9 @@
             <div class="element-wrapper">
                 {% if not is_numeric(inner_key) %}
                     {% if (content|length > 1) %}
-                        {{ _self.field(inner_key, parent_key, level, _context, true) }}
+                        {{ macro.field(inner_key, parent_key, level, _context, true) }}
                     {% else %}
-                        {{ _self.field(inner_key, parent_key, level, _context) }}
+                        {{ macro.field(inner_key, parent_key, level, _context) }}
                     {% endif %}
                     {% set level2 = level + 1 %}
                     {% set up_level = true %}
@@ -63,7 +63,7 @@
                     {% endif %}
 
                     {% set last_key = (is_numeric(inner_key)) ? '' : inner_key %}
-                    {{ _self.field(inner_content, parent_key ~ '[' ~ inner_key ~ ']', level2, _context) }}
+                    {{ macro.field(inner_content, parent_key ~ '[' ~ inner_key ~ ']', level2, _context) }}
 
                     {% if not is_numeric(inner_key) %}
                             </div>
@@ -72,7 +72,7 @@
                 {% else %}
 
                     {% set inner_parent_key = parent_key ~ '[' ~ inner_key ~ ']' %}
-                    {{ _self.renderer(inner_key, inner_content, field, scope, level, inner_parent_key, up_level) }}
+                    {{ macro.renderer(inner_key, inner_content, field, scope, level, inner_parent_key, up_level) }}
                 {% endif %}
             </div>
         {% endfor %}
diff --git a/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig b/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig
index fb176976..2369ba01 100644
--- a/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig
+++ b/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig
@@ -29,7 +29,7 @@
             {% if p.children().count > 0 %}
 
                 <ul class="depth-{{ depth + 1 }}" style="display:none;">
-                    {{ _self.loop(p, depth + 1, twig_vars) }}
+                    {{ macro.loop(p, depth + 1, twig_vars) }}
                 </ul>
             {% endif %}
         </li>