diff --git a/themes/grav/templates/config.html.twig b/themes/grav/templates/config.html.twig
index 9fc67a94..2df3687d 100644
--- a/themes/grav/templates/config.html.twig
+++ b/themes/grav/templates/config.html.twig
@@ -82,7 +82,7 @@
         {% if isInfo %}
             <div id="phpinfo">
                 <div style="margin-left:1.5rem">
-                    <a class="button button-big" href="#" style="text-align: center;" data-remodal-target="changelog" data-remodal-changelog="{{ base_url_relative }}/changelog/type:plugins/slug:{{ plugin.slug }}"><i class="fa fa-binoculars"></i> View Grav Changelog</a>
+                    <a class="button button-big" href="#" style="text-align: center;" data-remodal-target="changelog" data-remodal-changelog="{{ admin_route('/changelog/type:plugins/slug:' ~ plugin.slug) }}"><i class="fa fa-binoculars"></i> View Grav Changelog</a>
                 </div>
                 {{ admin.phpinfo|raw }}
             </div>
diff --git a/themes/grav/templates/media-list-content.html.twig b/themes/grav/templates/media-list-content.html.twig
index 4621ad67..74f4e162 100644
--- a/themes/grav/templates/media-list-content.html.twig
+++ b/themes/grav/templates/media-list-content.html.twig
@@ -6,7 +6,7 @@
     {% if the_file.exists and the_file.display() is not empty %}
     <div class="card-item">
         <div class="admin-media-details">
-            <a href="{% if is_modal %}#{% else %}{{ base_url_relative }}/media-manager/{{base64_encode(the_file.filepath)}}{% endif %}" class="js__media-element" data-file-url="{{ file.page_route ~ '/' ~ file.title }}">
+            <a href="{% if is_modal %}#{% else %}{{ admin_route('/media-manager/' ~ base64_encode(the_file.filepath)) }}{% endif %}" class="js__media-element" data-file-url="{{ file.page_route ~ '/' ~ file.title }}">
                 {% set thumbnail = the_file.display(the_file.extension == 'svg' ? 'source' : 'thumbnail') %}
                 {% if thumbnail %}
                 <img src="{{thumbnail.cropZoom(250, 250).url}}" />
diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig
index 21b2eec1..14a95b38 100644
--- a/themes/grav/templates/partials/login.html.twig
+++ b/themes/grav/templates/partials/login.html.twig
@@ -16,7 +16,7 @@
 
         {% set redirect = redirect ?: uri.path ~ uri.params ~ (uri.query ? '?' ~ uri.query : '') %}
 
-        <form method="post" action="{{ base_url_relative }}">
+        <form method="post" action="{{ admin_route('/') }}">
             <div class="padding">
                 {% block form %}{% endblock %}
                 <input type="hidden" name="redirect" value="{{ redirect }}" />
diff --git a/themes/grav/templates/partials/modal-remove-package.html.twig b/themes/grav/templates/partials/modal-remove-package.html.twig
index 81066796..8d45f6ad 100644
--- a/themes/grav/templates/partials/modal-remove-package.html.twig
+++ b/themes/grav/templates/partials/modal-remove-package.html.twig
@@ -23,14 +23,14 @@
                 <ul class="package-dependencies-container"></ul>
             </div>
             <div class="button-bar">
-                <a href="{{ base_url_relative ~ '/' ~ type ~ 's' }}" class="button secondary"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CLOSE"|tu }}</a>
+                <a href="{{ admin_route('/' ~ type ~ 's') }}" class="button secondary"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CLOSE"|tu }}</a>
             </div>
         </div>
 
         <div class="remove-package-done hidden">
             <h1>{{ "PLUGIN_ADMIN.REMOVED_SUCCESSFULLY"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }}</h1>
             <div class="button-bar">
-                <a href="{{ base_url_relative ~ '/' ~ type ~ 's' }}" class="button secondary"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CLOSE"|tu }}</a>
+                <a href="{{ admin_route('/' ~ type ~ 's') }}" class="button secondary"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CLOSE"|tu }}</a>
             </div>
         </div>
 
diff --git a/themes/grav/templates/partials/nav-quick-tray.html.twig b/themes/grav/templates/partials/nav-quick-tray.html.twig
index e3167339..392b3c64 100644
--- a/themes/grav/templates/partials/nav-quick-tray.html.twig
+++ b/themes/grav/templates/partials/nav-quick-tray.html.twig
@@ -30,7 +30,7 @@
     {% else %}
         {% if authorize(['admin.maintenance', 'admin.super']) %}
         <li class="hint--bottom" data-hint="Add the 'quick-tray-links' plugin for more...">
-            <a href="{{ base_url_relative ~ '/plugins/install' }}">
+            <a href="{{ admin_route('/plugins/install') }}">
                 <i class="fa fa-plus"></i>
             </a>
         </li>
diff --git a/themes/grav/templates/partials/plugin-data.html.twig b/themes/grav/templates/partials/plugin-data.html.twig
index 176f9810..6ce89d23 100644
--- a/themes/grav/templates/partials/plugin-data.html.twig
+++ b/themes/grav/templates/partials/plugin-data.html.twig
@@ -63,7 +63,7 @@
     {% if admin.gpm.findPackage(plugin.slug).changelog %}
     <tr>
         <td>{{ "PLUGIN_ADMIN.CHANGELOG"|tu }}:</td>
-        <td class="double"><a class="button button-small" href="#" data-remodal-target="changelog" data-remodal-changelog="{{ base_url_relative }}/changelog/slug:{{ plugin.slug }}"><i class="fa fa-binoculars"></i> View Changelog</a></td>
+        <td class="double"><a class="button button-small" href="#" data-remodal-target="changelog" data-remodal-changelog="{{ admin_route('/changelog/slug:' ~ plugin.slug) }}"><i class="fa fa-binoculars"></i> View Changelog</a></td>
     </tr>
     {% endif %}
 
diff --git a/themes/grav/templates/partials/plugins-list.html.twig b/themes/grav/templates/partials/plugins-list.html.twig
index 19df4c6d..ce641ca8 100644
--- a/themes/grav/templates/partials/plugins-list.html.twig
+++ b/themes/grav/templates/partials/plugins-list.html.twig
@@ -22,7 +22,7 @@
         <tr data-gpm-plugin="{{ slug|url_encode }}" data-gpm-name="{{ plugin.name }}" data-gpm-release-date="{{ releaseDate }}" data-gpm-author="{{ plugin.author.name }}" data-gpm-official="{{ admin.isTeamGrav(plugin) ? '1' : '2' }}" data-gpm-updatable="{{ admin.gpm.isUpdatable(slug) ? '1' : '2' }}" data-gpm-enabled="{{ data.get('enabled') ? '1' : '2' }}" data-gpm-testing="{{ isTestingRelease ? '1' : '2' }}">
             <td class="gpm-name quadruple">
                 <i class="fa fa-fw fa-{{ plugin.icon }}"></i>
-                <a href="{{ base_url_relative }}/plugins/{{ slug|url_encode }}">{{ plugin.name }}</a>
+                <a href="{{ admin_route('/plugins/' ~ slug|url_encode) }}">{{ plugin.name }}</a>
                 {% if admin.isTeamGrav(plugin) %}
                     <small><span class="info-reverse"><i class="fa fa-check-circle" title="{{ "PLUGIN_ADMIN.GRAV_OFFICIAL_PLUGIN"|tu }}"></i></span></small>
                 {% endif %}
diff --git a/themes/grav/templates/partials/themes-details.html.twig b/themes/grav/templates/partials/themes-details.html.twig
index 4d3ef714..7cfdf466 100644
--- a/themes/grav/templates/partials/themes-details.html.twig
+++ b/themes/grav/templates/partials/themes-details.html.twig
@@ -95,7 +95,7 @@
         {% if admin.gpm.findPackage(theme.slug).changelog %}
         <tr>
             <td>{{ "PLUGIN_ADMIN.CHANGELOG"|tu }}:</td>
-            <td class="double"><a class="button button-small" href="#" data-remodal-target="changelog" data-remodal-changelog="{{ base_url_relative }}/changelog/slug:{{ theme.slug }}"><i class="fa fa-binoculars"></i> View Changelog</a></td>
+            <td class="double"><a class="button button-small" href="#" data-remodal-target="changelog" data-remodal-changelog="{{ admin_route('/changelog/slug:' ~ theme.slug) }}"><i class="fa fa-binoculars"></i> View Changelog</a></td>
         </tr>
         {% endif %}
     </table>
diff --git a/themes/grav/templates/partials/themes-list.html.twig b/themes/grav/templates/partials/themes-list.html.twig
index 9dcb65ef..407e393e 100644
--- a/themes/grav/templates/partials/themes-list.html.twig
+++ b/themes/grav/templates/partials/themes-list.html.twig
@@ -23,7 +23,7 @@
         <div class="theme card-item pure-u-1-3 {{ state }}-theme" data-gpm-theme="{{ slug|url_encode }}" data-gpm-name="{{ theme.name }}" data-gpm-release-date="{{ releaseDate }}" data-gpm-author="{{ theme.author.name }}" data-gpm-official="{{ admin.isTeamGrav(theme) ? '1' : '2' }}" data-gpm-updatable="{{ admin.gpm.isUpdatable(slug) ? '1' : '2' }}" data-gpm-enabled="{{ data.get('enabled') ? '1' : '2' }}" data-gpm-testing="{{ isTestingRelease ? '1' : '2' }}">
             <div class="gpm-name">
                 <i class="fa fa-fw fa-{{ theme.icon }}"></i>
-                <a href="{{ base_url_relative }}/themes/{{ slug|url_encode }}">{{ theme.name }}</a>
+                <a href="{{ admin_route('/themes/' ~ slug|url_encode) }}">{{ theme.name }}</a>
                 {% if admin.isTeamGrav(theme) %}
                     <small><span class="info-reverse"><i class="fa fa-check-circle" title="{{ "PLUGIN_ADMIN.GRAV_OFFICIAL_THEME"|tu }}"></i></span></small>
                 {% endif %}