diff --git a/themes/grav/templates/dashboard.html.twig b/themes/grav/templates/dashboard.html.twig
index 918ea915..e9237004 100644
--- a/themes/grav/templates/dashboard.html.twig
+++ b/themes/grav/templates/dashboard.html.twig
@@ -3,20 +3,20 @@
 {% block titlebar %}
     <div class="button-bar">
         <div class="button-group">
-            <button data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache" class="button"><i class="fa fa-trash"></i> {{ "PLUGIN_ADMIN_CLEAR_CACHE"|t }}</button>
+            <button data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache" class="button"><i class="fa fa-trash"></i> {{ "PLUGIN_ADMIN_CLEAR_CACHE"|tu }}</button>
             <button type="button" class="button dropdown-toggle" data-toggle="dropdown">
                 <i class="fa fa-caret-down"></i>
             </button>
             <ul class="dropdown-menu">
-                <li><a data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache/cleartype:all" href="#">{{ "PLUGIN_ADMIN_CLEAR_CACHE_ALL_CACHE"|t }}</a></li>
-                <li><a data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache/cleartype:assets-only" href="#">{{ "PLUGIN_ADMIN_CLEAR_CACHE_ASSETS_ONLY"|t }}</a></li>
-                <li><a data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache/cleartype:images-only" href="#">{{ "PLUGIN_ADMIN_CLEAR_CACHE_IMAGES_ONLY"|t }}</a></li>
-                <li><a data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache/cleartype:cache-only" href="#">{{ "PLUGIN_ADMIN_CLEAR_CACHE_CACHE_ONLY"|t }}</a></li>
+                <li><a data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache/cleartype:all" href="#">{{ "PLUGIN_ADMIN_CLEAR_CACHE_ALL_CACHE"|tu }}</a></li>
+                <li><a data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache/cleartype:assets-only" href="#">{{ "PLUGIN_ADMIN_CLEAR_CACHE_ASSETS_ONLY"|tu }}</a></li>
+                <li><a data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache/cleartype:images-only" href="#">{{ "PLUGIN_ADMIN_CLEAR_CACHE_IMAGES_ONLY"|tu }}</a></li>
+                <li><a data-clear-cache="{{ base_url_relative }}/cache.json/task{{ config.system.param_sep }}clearCache/cleartype:cache-only" href="#">{{ "PLUGIN_ADMIN_CLEAR_CACHE_CACHE_ONLY"|tu }}</a></li>
             </ul>
         </div>
-        <button data-gpm-checkupdates="" class="button"><i class="fa fa-refresh"></i> {{ "PLUGIN_ADMIN_CHECK_FOR_UPDATES"|t }}</button>
+        <button data-gpm-checkupdates="" class="button"><i class="fa fa-refresh"></i> {{ "PLUGIN_ADMIN_CHECK_FOR_UPDATES"|tu }}</button>
     </div>
-    <h1><i class="fa fa-fw fa-th"></i> {{ "PLUGIN_ADMIN_DASHBOARD"|t }}</h1>
+    <h1><i class="fa fa-fw fa-th"></i> {{ "PLUGIN_ADMIN_DASHBOARD"|tu }}</h1>
 {% endblock %}
 
 {% block messages %}{% endblock %}
@@ -30,14 +30,14 @@
     <div id="admin-dashboard">
         <div id="updates" class="dashboard-item dashboard-left">
             <div class="tertiary-accent default-box-shadow">
-                <h1>{{ "PLUGIN_ADMIN_MAINTENANCE"|t }}</h1>
+                <h1>{{ "PLUGIN_ADMIN_MAINTENANCE"|tu }}</h1>
                 <div class="admin-update-charts">
                     <div class="updates-chart">
                         <div class="chart-wrapper">
                             <div class="ct-chart"></div>
-                            <span class="numeric"><span>-</span><em>{{ "PLUGIN_ADMIN_UPDATED"|t|lower }}</em></span>
+                            <span class="numeric"><span>-</span><em>{{ "PLUGIN_ADMIN_UPDATED"|tu|lower }}</em></span>
                         </div>
-                        <p>{{ "PLUGIN_ADMIN_UPDATES_AVAILABLE"|t }}</p>
+                        <p>{{ "PLUGIN_ADMIN_UPDATES_AVAILABLE"|tu }}</p>
                     </div>
                     <div class="backups-chart">
                         <div class="chart-wrapper">
@@ -56,20 +56,20 @@
                                 };
                                 Chartist.Pie('.backups-chart .ct-chart', data, options);
                             </script>
-                            <span class="numeric">{{ backup.days }}<em>{{ "PLUGIN_ADMIN_DAYS"|t|lower }}</em></span>
+                            <span class="numeric">{{ backup.days }}<em>{{ "PLUGIN_ADMIN_DAYS"|tu|lower }}</em></span>
                         </div>
                         <p>Last Backup</p>
                     </div>
                 </div>
                 <div class="flush-bottom button-bar">
-                    <button data-maintenance-update="{{ base_url_relative }}/update.json/task{{ config.system.param_sep }}update" class="button"><i class="fa fa-cloud-download"></i> {{ "PLUGIN_ADMIN_UPDATE"|t }}</button>
-                    <button data-ajax="{{ base_url_relative }}/backup.json/task{{ config.system.param_sep }}backup" class="button"><i class="fa fa-database"></i> {{ "PLUGIN_ADMIN_BACKUP"|t }}</button>
+                    <button data-maintenance-update="{{ base_url_relative }}/update.json/task{{ config.system.param_sep }}update" class="button"><i class="fa fa-cloud-download"></i> {{ "PLUGIN_ADMIN_UPDATE"|tu }}</button>
+                    <button data-ajax="{{ base_url_relative }}/backup.json/task{{ config.system.param_sep }}backup" class="button"><i class="fa fa-database"></i> {{ "PLUGIN_ADMIN_BACKUP"|tu }}</button>
                 </div>
             </div>
         </div>
         <div id="popularity" class="dashboard-item dashboard-right">
             <div class="secondary-accent default-box-shadow">
-                <h1>{{ "PLUGIN_ADMIN_STATISTICS"|t }}</h1>
+                <h1>{{ "PLUGIN_ADMIN_STATISTICS"|tu }}</h1>
                 <div class="ct-chart"></div>
                 <script>
                     var data = {
@@ -105,15 +105,15 @@
                 <div class="flush-bottom button-bar stats-bar">
                     <span class="stat">
                         <b>{{ popularity.getDailyTotal }}</b>
-                        <i>{{ "PLUGIN_ADMIN_TODAY"|t }}</i>
+                        <i>{{ "PLUGIN_ADMIN_TODAY"|tu }}</i>
                     </span>
                     <span class="stat">
                         <b>{{ popularity.getWeeklyTotal }}</b>
-                        <i>{{ "PLUGIN_ADMIN_WEEK"|t }}</i>
+                        <i>{{ "PLUGIN_ADMIN_WEEK"|tu }}</i>
                     </span>
                     <span class="stat">
                         <b>{{ popularity.getMonthlyTotal }}</b>
-                        <i>{{ "PLUGIN_ADMIN_MONTH"|t }}</i>
+                        <i>{{ "PLUGIN_ADMIN_MONTH"|tu }}</i>
                     </span>
                 </div>
             </div>
@@ -125,13 +125,13 @@
 
     {% include 'partials/messages.html.twig' %}
     {% if config.plugins.admin.show_beta_msg %}
-    <div class="error alert"><i class="fa fa-exclamation-circle"></i> {{ 'ADMIN_BETA_MSG'|t }}</div>
+    <div class="error alert"><i class="fa fa-exclamation-circle"></i> {{ 'ADMIN_BETA_MSG'|tu }}</div>
     {% endif %}
     <div id="latest">
         <div class="button-bar">
-            <a class="button" href="{{ uri.route(true) }}/pages"><i class="fa fa-fw fa-file-text-o"></i>{{ "PLUGIN_ADMIN_MANAGE_PAGES"|t }}</a>
+            <a class="button" href="{{ uri.route(true) }}/pages"><i class="fa fa-fw fa-file-text-o"></i>{{ "PLUGIN_ADMIN_MANAGE_PAGES"|tu }}</a>
         </div>
-        <h1>{{ "PLUGIN_ADMIN_LATEST_PAGE_UPDATES"|t }}</h1>
+        <h1>{{ "PLUGIN_ADMIN_LATEST_PAGE_UPDATES"|tu }}</h1>
         <table>
         {% for latest in admin.latestPages %}
             <tr><td class="double"><a href="{{ base_url }}/pages/{{ latest.route|trim('/') }}"><i class="fa fa-fw fa-file-o"></i> {{ latest.title }}</a></td><td class="double">{{ latest.route }}</td><td><b>{{ latest.modified|nicetime }}</b></td></tr>
diff --git a/themes/grav/templates/email/base.html.twig b/themes/grav/templates/email/base.html.twig
index 80cb38a0..91edfc55 100644
--- a/themes/grav/templates/email/base.html.twig
+++ b/themes/grav/templates/email/base.html.twig
@@ -179,7 +179,7 @@
                 <table>
                     <tr>
                         <td align="center">
-                            {{ 'EMAIL_FOOTER'|t }}
+                            {{ 'EMAIL_FOOTER'|tu }}
                         </td>
                     </tr>
                 </table>
diff --git a/themes/grav/templates/forgot.html.twig b/themes/grav/templates/forgot.html.twig
index 33eca4a8..48920d1f 100644
--- a/themes/grav/templates/forgot.html.twig
+++ b/themes/grav/templates/forgot.html.twig
@@ -9,7 +9,7 @@
             {% endif %}
         {% endfor %}
         <div class="form-actions secondary-accent">
-            <button type="submit" class="button primary" name="task" value="forgot"><i class="fa fa-paper-plane"></i> {{ "LOGIN_BTN_SEND_INSTRUCTIONS"|t }}</button>
+            <button type="submit" class="button primary" name="task" value="forgot"><i class="fa fa-paper-plane"></i> {{ "LOGIN_BTN_SEND_INSTRUCTIONS"|tu }}</button>
         </div>
     {% endblock %}
 
diff --git a/themes/grav/templates/login.html.twig b/themes/grav/templates/login.html.twig
index 00366ecf..6a47867f 100644
--- a/themes/grav/templates/login.html.twig
+++ b/themes/grav/templates/login.html.twig
@@ -9,8 +9,8 @@
                 {% endif %}
             {% endfor %}
             <div class="form-actions secondary-accent">
-                <a class="button secondary" href="{{ base_url_relative }}/forgot"><i class="fa fa-exclamation-circle"></i> {{ 'LOGIN_BTN_FORGOT'|t }}</a>
-                <button type="submit" class="button primary" name="task" value="login"><i class="fa fa-sign-in"></i> {{ 'LOGIN_BTN'|t }}</button>
+                <a class="button secondary" href="{{ base_url_relative }}/forgot"><i class="fa fa-exclamation-circle"></i> {{ 'LOGIN_BTN_FORGOT'|tu }}</a>
+                <button type="submit" class="button primary" name="task" value="login"><i class="fa fa-sign-in"></i> {{ 'LOGIN_BTN'|tu }}</button>
             </div>
     {% endblock %}
 
diff --git a/themes/grav/templates/logout.html.twig b/themes/grav/templates/logout.html.twig
index cf454adb..aad1682b 100644
--- a/themes/grav/templates/logout.html.twig
+++ b/themes/grav/templates/logout.html.twig
@@ -10,7 +10,7 @@
             {{ title }}
         </h1>
 
-        <div class="info alert">{{ 'LOGGED_OUT'|t }}</div>
+        <div class="info alert">{{ 'LOGGED_OUT'|tu }}</div>
         {% include 'partials/messages.html.twig' %}
     </section>
     {% endblock %}
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index e82a3725..5cdc6091 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -75,32 +75,32 @@
 {% block titlebar %}
     <div class="button-bar">
         {% if mode == 'list' %}
-            <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|t }}</a>
-            <a class="button" href="#modal" data-remodal-target="modal"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN_ADD_PAGE"|t }}</a>
-            <a class="button" href="#modular" data-remodal-target="modular"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN_ADD_MODULAR"|t }}</a>
+            <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|tu }}</a>
+            <a class="button" href="#modal" data-remodal-target="modal"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN_ADD_PAGE"|tu }}</a>
+            <a class="button" href="#modular" data-remodal-target="modular"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN_ADD_MODULAR"|tu }}</a>
         {% elseif mode == 'edit' %}
-            <a class="button" href="{{ base_url }}/pages"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|t }}</a>
+            <a class="button" href="{{ base_url }}/pages"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|tu }}</a>
             {% if exists %}
-                <a class="button" href="{{ uri.route(true) }}/task{{ config.system.param_sep }}copy" class="page-copy" ><i class="fa fa-copy"></i> {{ "PLUGIN_ADMIN_COPY"|t }}</a>
-                <a class="button" href="#" data-remodal-target="move"><i class="fa fa-arrows"></i> {{ "PLUGIN_ADMIN_MOVE"|t }}</a>
+                <a class="button" href="{{ uri.route(true) }}/task{{ config.system.param_sep }}copy" class="page-copy" ><i class="fa fa-copy"></i> {{ "PLUGIN_ADMIN_COPY"|tu }}</a>
+                <a class="button" href="#" data-remodal-target="move"><i class="fa fa-arrows"></i> {{ "PLUGIN_ADMIN_MOVE"|tu }}</a>
                 {% if warn %}
-                    <a class="button" href="#delete" data-remodal-target="delete" data-delete-url="{{ uri.route(true) }}/task{{ config.system.param_sep }}delete"><i class="fa fa-close"></i> {{ "PLUGIN_ADMIN_DELETE"|t }}</a>
+                    <a class="button" href="#delete" data-remodal-target="delete" data-delete-url="{{ uri.route(true) }}/task{{ config.system.param_sep }}delete"><i class="fa fa-close"></i> {{ "PLUGIN_ADMIN_DELETE"|tu }}</a>
                 {% else %}
                     <a class="button" href="{{ uri.route(true) }}/task{{ config.system.param_sep }}delete" class="page-delete" ><i class="fa fa-close"></i></a>
                 {% endif %}
             {% endif %}
-            <button class="button" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN_SAVE"|t }}</button>
+            <button class="button" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN_SAVE"|tu }}</button>
 
         {% endif %}
     </div>
     {% if mode == 'new' %}
-        <h1><i class="fa fa-fw fa-file-text-o"></i> {{ "PLUGIN_ADMIN_ADD_PAGE"|t }}</h1>
+        <h1><i class="fa fa-fw fa-file-text-o"></i> {{ "PLUGIN_ADMIN_ADD_PAGE"|tu }}</h1>
     {% elseif mode == 'edit' %}
         <h1><i class="fa fa-fw fa-file-text-o"></i>
-            {{ context.exists ? "PLUGIN_ADMIN_EDIT"|t ~ " '#{context.menu}'" ~ preview_link : "PLUGIN_ADMIN_CREATE"|t ~ " '#{context.menu}'" }}
+            {{ context.exists ? "PLUGIN_ADMIN_EDIT"|tu ~ " '#{context.menu}'" ~ preview_link : "PLUGIN_ADMIN_CREATE"|tu ~ " '#{context.menu}'" }}
         </h1>
     {% else %}
-        <h1><i class="fa fa-fw fa-file-text-o"></i> {{ "PLUGIN_ADMIN_MANAGE_PAGES"|t }}</h1>
+        <h1><i class="fa fa-fw fa-file-text-o"></i> {{ "PLUGIN_ADMIN_MANAGE_PAGES"|tu }}</h1>
     {% endif %}
 {% endblock %}
 
@@ -115,9 +115,9 @@
             <form id="admin-mode-toggle">
                 <div class="switch-toggle switch-grav">
                     <input type="radio" value="normal" data-leave-url="{{ uri.route(true) }}/mode:normal" id="normal" name="mode-switch" class="highlight" {% if admin.session.expert == '0' %} checked="checked"{% endif %}>
-                    <label for="normal">{{ "PLUGIN_ADMIN_NORMAL"|t }}</label>
+                    <label for="normal">{{ "PLUGIN_ADMIN_NORMAL"|tu }}</label>
                     <input type="radio" value="expert" data-leave-url="{{ uri.route(true) }}/mode:expert" id="expert" name="mode-switch" class="highlight" {% if admin.session.expert == '1' %} checked="checked"{% endif %}>
-                    <label for="expert">{{ "PLUGIN_ADMIN_EXPERT"|t }}</label>
+                    <label for="expert">{{ "PLUGIN_ADMIN_EXPERT"|tu }}</label>
                     <a></a>
                 </div>
             </form>
@@ -132,14 +132,14 @@
     {% else %}
         <form id="page-filtering">
             <div class="page-filters">
-                <input type="text" placeholder="{{ "PLUGIN_ADMIN_ADD_FILTERS"|t }}" class="page-filter" name="page-filter" />
+                <input type="text" placeholder="{{ "PLUGIN_ADMIN_ADD_FILTERS"|tu }}" class="page-filter" name="page-filter" />
             </div>
             <div class="page-search">
-                <input type="text" placeholder="{{ "PLUGIN_ADMIN_SEARCH_PAGES"|t }}" name="page-search" />
+                <input type="text" placeholder="{{ "PLUGIN_ADMIN_SEARCH_PAGES"|tu }}" name="page-search" />
             </div>
             <div class="page-shortcuts">
-                <span class="button button-x-small" data-page-toggleall="expand"><i class="fa fa-fw fa-plus-circle"></i> {{ "PLUGIN_ADMIN_EXPAND_ALL"|t }}</span>
-                <span class="button button-x-small" data-page-toggleall="collapse"><i class="fa fa-fw fa-minus-circle"></i> {{ "PLUGIN_ADMIN_COLLAPSE_ALL"|t }}</span>
+                <span class="button button-x-small" data-page-toggleall="expand"><i class="fa fa-fw fa-plus-circle"></i> {{ "PLUGIN_ADMIN_EXPAND_ALL"|tu }}</span>
+                <span class="button button-x-small" data-page-toggleall="collapse"><i class="fa fa-fw fa-minus-circle"></i> {{ "PLUGIN_ADMIN_COLLAPSE_ALL"|tu }}</span>
             </div>
         </form>
         <ul class="pages-list depth-0">
@@ -150,10 +150,10 @@
 
     <div class="remodal" data-remodal-id="generic" data-remodal-options="hashTracking: false">
         <form>
-            <h1>{{ "PLUGIN_ADMIN_ERROR"|t }}</h1>
+            <h1>{{ "PLUGIN_ADMIN_ERROR"|tu }}</h1>
             <div class="error-content"></div>
             <div class="button-bar">
-                <a class="button remodal-confirm" href="#">{{ "PLUGIN_ADMIN_CLOSE"|t }}</a>
+                <a class="button remodal-confirm" href="#">{{ "PLUGIN_ADMIN_CLOSE"|tu }}</a>
             </div>
         </form>
     </div>
@@ -177,14 +177,14 @@
 
     <div class="remodal" data-remodal-id="delete" data-remodal-options="hashTracking: false">
         <form>
-            <h1>{{ "PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_TITLE"|t }}</h1>
+            <h1>{{ "PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_TITLE"|tu }}</h1>
             <p class="bigger">
-              {{ "PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC"|t }}
+              {{ "PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC"|tu }}
             </p>
             <br>
             <div class="button-bar">
-            <a class="button secondary remodal-cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|t }}</a>
-            <a class="button" data-delete-action href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|t }}</a>
+            <a class="button secondary remodal-cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|tu }}</a>
+            <a class="button" data-delete-action href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|tu }}</a>
             </div>
         </form>
     </div>
@@ -192,28 +192,28 @@
 
     <div class="remodal" data-remodal-id="changes">
         <form>
-            <h1>{{ "PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_TITLE"|t }}</h1>
+            <h1>{{ "PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_TITLE"|tu }}</h1>
             <p class="bigger">
-                {{ "PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_DESC"|t }}
+                {{ "PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_DESC"|tu }}
             </p>
             <br>
             <div class="button-bar">
-            <a class="button secondary" data-leave-action="cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|t }}</a>
-            <a class="button" data-leave-action="continue" href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|t }}</a>
+            <a class="button secondary" data-leave-action="cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|tu }}</a>
+            <a class="button" data-leave-action="continue" href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|tu }}</a>
             </div>
         </form>
     </div>
 
     <div class="remodal" data-remodal-id="delete-media" data-remodal-options="hashTracking: false">
         <form>
-            <h1>{{ "PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|t }}</h1>
+            <h1>{{ "PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|tu }}</h1>
             <p class="bigger">
-                {{ "PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC"|t }}
+                {{ "PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC"|tu }}
             </p>
             <br>
             <div class="button-bar">
-            <a class="button secondary remodal-cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|t }}</a>
-            <a class="button remodal-confirm" href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|t }}</a>
+            <a class="button secondary remodal-cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|tu }}</a>
+            <a class="button remodal-confirm" href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|tu }}</a>
             </div>
         </form>
     </div>
diff --git a/themes/grav/templates/partials/base.html.twig b/themes/grav/templates/partials/base.html.twig
index d1eef89b..12e56349 100644
--- a/themes/grav/templates/partials/base.html.twig
+++ b/themes/grav/templates/partials/base.html.twig
@@ -90,12 +90,12 @@
                         {% block content %}{% endblock %}
                     </div>
                     {% if config.plugins.admin.show_beta_msg %}
-                    <div class="notice alert"><i class="fa fa-github"></i> <a href="https://github.com/getgrav/grav-plugin-admin/issues">{{ 'ADMIN_REPORT_ISSUE'|t }}</a></div>
+                    <div class="notice alert"><i class="fa fa-github"></i> <a href="https://github.com/getgrav/grav-plugin-admin/issues">{{ 'ADMIN_REPORT_ISSUE'|tu }}</a></div>
                     {% endif %}
                     {% block content_bottom %}{% endblock %}
                 </div>
                  <footer id="footer">
-                    <a href="http://getgrav.org">Grav</a> {{ "PLUGIN_ADMIN_VERSION"|t|lower }} <span class="grav-version">{{ constant('GRAV_VERSION') }}</span> {{ "PLUGIN_ADMIN_WAS_MADE_WITH"|t|lower }} <i class="fa fa-heart"></i> {{ "PLUGIN_ADMIN_BY"|t|lower }} <a href="http://www.rockettheme.com">RocketTheme</a>.
+                    <a href="http://getgrav.org">Grav</a> {{ "PLUGIN_ADMIN_VERSION"|tu|lower }} <span class="grav-version">{{ constant('GRAV_VERSION') }}</span> {{ "PLUGIN_ADMIN_WAS_MADE_WITH"|tu|lower }} <i class="fa fa-heart"></i> {{ "PLUGIN_ADMIN_BY"|tu|lower }} <a href="http://www.rockettheme.com">RocketTheme</a>.
                 </footer>
             </div>
 
diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig
index bcdf6383..06f52ef3 100644
--- a/themes/grav/templates/partials/blueprints-new.html.twig
+++ b/themes/grav/templates/partials/blueprints-new.html.twig
@@ -11,6 +11,6 @@
     {% endfor %}
 
     <div class="button-bar">
-        <button class="button primary" name="task" value="continue">{{ "PLUGIN_ADMIN_CONTINUE"|t }}</button>
+        <button class="button primary" name="task" value="continue">{{ "PLUGIN_ADMIN_CONTINUE"|tu }}</button>
     </div>
 </form>
diff --git a/themes/grav/templates/partials/nav.html.twig b/themes/grav/templates/partials/nav.html.twig
index 86282513..20d235ec 100644
--- a/themes/grav/templates/partials/nav.html.twig
+++ b/themes/grav/templates/partials/nav.html.twig
@@ -1,6 +1,6 @@
 <nav id="admin-sidebar">
     <div id="admin-logo">
-        <h3><a href="{{ base_url_relative }}">{{ "PLUGIN_ADMIN_GRAV_ADMIN"|t }}</a> <a target="_blank" href="{{ base_url_relative_frontend }}"><i class="fa fa-fw fa-angle-double-right"></i></a></h3>
+        <h3><a href="{{ base_url_relative }}">{{ "PLUGIN_ADMIN_GRAV_ADMIN"|tu }}</a> <a target="_blank" href="{{ base_url_relative_frontend }}"><i class="fa fa-fw fa-angle-double-right"></i></a></h3>
     </div>
 
     {#{% if admin.authorise %}#}
@@ -18,14 +18,14 @@
 
     <ul id="admin-menu">
         <li class="{{ (location == 'dashboard') ? 'selected' : '' }}">
-            <a href="{{ base_url_relative }}"><i class="fa fa-fw fa-th"></i> {{ "PLUGIN_ADMIN_DASHBOARD"|t }}</a>
+            <a href="{{ base_url_relative }}"><i class="fa fa-fw fa-th"></i> {{ "PLUGIN_ADMIN_DASHBOARD"|tu }}</a>
         </li>
         <li class="{{ (location == 'system' or location == 'site') ? 'selected' : '' }}">
-            <a href="{{ base_url_relative }}/system"><i class="fa fa-fw fa-wrench"></i> {{ "PLUGIN_ADMIN_CONFIGURATION"|t }}</a>
+            <a href="{{ base_url_relative }}/system"><i class="fa fa-fw fa-wrench"></i> {{ "PLUGIN_ADMIN_CONFIGURATION"|tu }}</a>
         </li>
         <li class="{{ (location == 'pages') ? 'selected' : '' }}">
             <a href="{{ base_url_relative }}/pages">
-                <i class="fa fa-fw fa-file-text-o"></i> {{ "PLUGIN_ADMIN_PAGES"|t }}
+                <i class="fa fa-fw fa-file-text-o"></i> {{ "PLUGIN_ADMIN_PAGES"|tu }}
                 <span class="badges">
                     <span class="badge count">{{ admin.routes|length }}</span>
                 </span>
@@ -33,7 +33,7 @@
         </li>
         <li class="{{ (location == 'plugins') ? 'selected' : '' }}">
             <a href="{{ base_url_relative }}/plugins">
-                <i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_PLUGINS"|t }}
+                <i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_PLUGINS"|tu }}
                 <span class="badges">
                     <span class="badge updates"></span>
                     <span class="badge count">{{ admin.plugins|length }}</span>
@@ -43,7 +43,7 @@
         </li>
         <li class="{{ (location == 'themes') ? 'selected' : '' }}">
             <a href="{{ base_url_relative }}/themes">
-                <i class="fa fa-fw fa-tint"></i> {{ "PLUGIN_ADMIN_THEMES"|t }}
+                <i class="fa fa-fw fa-tint"></i> {{ "PLUGIN_ADMIN_THEMES"|tu }}
                 <span class="badges">
                     <span class="badge updates"></span>
                     <span class="badge count">{{ admin.themes|length }}</span>
@@ -62,7 +62,7 @@
             </a>
         </li> -->
         <li>
-            <a href="{{ base_url_relative }}/task{{ config.system.param_sep }}logout"><i class="fa fa-fw fa-sign-out"></i> {{ "PLUGIN_ADMIN_LOGOUT"|t }}</a>
+            <a href="{{ base_url_relative }}/task{{ config.system.param_sep }}logout"><i class="fa fa-fw fa-sign-out"></i> {{ "PLUGIN_ADMIN_LOGOUT"|tu }}</a>
         </li>
     </ul>
 </nav>
diff --git a/themes/grav/templates/partials/page-move.html.twig b/themes/grav/templates/partials/page-move.html.twig
index a1bc28e9..800dbe6e 100644
--- a/themes/grav/templates/partials/page-move.html.twig
+++ b/themes/grav/templates/partials/page-move.html.twig
@@ -11,7 +11,7 @@
     {% endfor %}
 
     <div class="button-bar">
-        <a class="button secondary remodal-cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|t }}</a>
-        <button class="button primary" name="task" value="continue" form="blueprints">{{ "PLUGIN_ADMIN_CONTINUE"|t }}</button>
+        <a class="button secondary remodal-cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|tu }}</a>
+        <button class="button primary" name="task" value="continue" form="blueprints">{{ "PLUGIN_ADMIN_CONTINUE"|tu }}</button>
     </div>
 </form>
diff --git a/themes/grav/templates/partials/plugin-data.html.twig b/themes/grav/templates/partials/plugin-data.html.twig
index 4657dfd8..0504aeeb 100644
--- a/themes/grav/templates/partials/plugin-data.html.twig
+++ b/themes/grav/templates/partials/plugin-data.html.twig
@@ -1,7 +1,7 @@
 <table>
     {% if plugin.author %}
     <tr>
-        <td>{{ "PLUGIN_ADMIN_AUTHOR"|t }}:</td>
+        <td>{{ "PLUGIN_ADMIN_AUTHOR"|tu }}:</td>
         <td>
             {% if plugin.author.url %}
                 <a href="{{ plugin.author.url }}" target="_blank">{{ plugin.author.name }}</a>
@@ -16,38 +16,38 @@
     {% endif %}
     {% if plugin.homepage %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_HOMEPAGE"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_HOMEPAGE"|tu }}:</td>
             <td><a href="{{ plugin.homepage }}" target="_blank">{{ plugin.homepage }}</a></td>
         </tr>
     {% endif %}
     {% if plugin.demo %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_DEMO"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_DEMO"|tu }}:</td>
             <td><a href="{{ plugin.demo }}" target="_blank">{{ plugin.demo }}</a></td>
         </tr>
     {% endif %}
     {% if plugin.bugs %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_BUG_TRACKER"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_BUG_TRACKER"|tu }}:</td>
             <td><a href="{{ plugin.bugs }}" target="_blank">{{ plugin.bugs }}</a></td>
         </tr>
     {% endif %}
     {% if plugin.keywords %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_KEYWORDS"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_KEYWORDS"|tu }}:</td>
             <td>{{ plugin.keywords|join(', ') }}</td>
         </tr>
     {% endif %}
     {% if plugin.license %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_LICENSE"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_LICENSE"|tu }}:</td>
             <td>{{ plugin.license }}</td>
         </tr>
     {% endif %}
 
     {% if plugin.description %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_DESCRIPTION"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_DESCRIPTION"|tu }}:</td>
             <td>{{ plugin.description_html }}</td>
         </tr>
     {% endif %}
@@ -55,7 +55,7 @@
     {% if plugin.readme or plugin.homepage %}
         {% set readme_link = plugin.readme ?: plugin.homepage ~ '/blob/develop/README.md' %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_README"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_README"|tu }}:</td>
             <td><a href="{{ readme_link }}" target="_blank">{{ readme_link }}</a></td>
         </tr>
     {% endif %}
diff --git a/themes/grav/templates/partials/plugins-details.html.twig b/themes/grav/templates/partials/plugins-details.html.twig
index 916a341e..b5cc84f9 100644
--- a/themes/grav/templates/partials/plugins-details.html.twig
+++ b/themes/grav/templates/partials/plugins-details.html.twig
@@ -6,8 +6,8 @@
     {% set remote = gpm.getRepositoryPlugin(admin.route) %}
         <p>
             <i class="fa fa-bullhorn"></i>
-            <strong>v{{ remote.available }}</strong> {{ "PLUGIN_ADMIN_OF_THIS_PLUGIN_IS_NOW_AVAILABLE"|t }}!
-            <button class="button button-small secondary" data-download="{{ remote.zipball_url }}">{{ "PLUGIN_ADMIN_UPDATE_PLUGIN"|t }}</button>
+            <strong>v{{ remote.available }}</strong> {{ "PLUGIN_ADMIN_OF_THIS_PLUGIN_IS_NOW_AVAILABLE"|tu }}!
+            <button class="button button-small secondary" data-download="{{ remote.zipball_url }}">{{ "PLUGIN_ADMIN_UPDATE_PLUGIN"|tu }}</button>
         </p>
 {% endif %}
 </div>
@@ -15,10 +15,10 @@
 <h1>
     {{ plugin.name|e }}
     {% if admin.isTeamGrav(plugin) %}
-        <small><span class="info-reverse"><i class="fa fa-check-circle" title="{{ "PLUGIN_ADMIN_GRAV_OFFICIAL_PLUGIN"|t }}"></i></span></small>
+        <small><span class="info-reverse"><i class="fa fa-check-circle" title="{{ "PLUGIN_ADMIN_GRAV_OFFICIAL_PLUGIN"|tu }}"></i></span></small>
     {% endif %}
     {% if plugin.symlink %}
-    <small class="hint--bottom" data-hint="{{ "PLUGIN_ADMIN_SYMBOLICALLY_LINKED"|t }}">
+    <small class="hint--bottom" data-hint="{{ "PLUGIN_ADMIN_SYMBOLICALLY_LINKED"|tu }}">
         <i class="fa fa-fw fa-link"></i>
     </small>
     {% endif %}
@@ -35,10 +35,10 @@
 
     <div class="button-bar danger">
         <span class="danger-zone"></span>
-        <a class="button" href="{{ base_url_relative }}/plugins/{{ plugin.slug }}/task{{ config.system.param_sep }}uninstall"><i class="fa fa-fw fa-warning"></i>{{ "PLUGIN_ADMIN_REMOVE_PLUGIN"|t }}</a>
+        <a class="button" href="{{ base_url_relative }}/plugins/{{ plugin.slug }}/task{{ config.system.param_sep }}uninstall"><i class="fa fa-fw fa-warning"></i>{{ "PLUGIN_ADMIN_REMOVE_PLUGIN"|tu }}</a>
     </div>
 {% else %}
     <div class="button-bar success">
-        <a class="button" href="{{ base_url_relative }}/plugins/{{ plugin.slug }}/task{{ config.system.param_sep }}install"><i class="fa fa-fw fa-plus"></i>{{ "PLUGIN_ADMIN_INSTALL_PLUGIN"|t }}</a>
+        <a class="button" href="{{ base_url_relative }}/plugins/{{ plugin.slug }}/task{{ config.system.param_sep }}install"><i class="fa fa-fw fa-plus"></i>{{ "PLUGIN_ADMIN_INSTALL_PLUGIN"|tu }}</a>
     </div>
 {% endif %}
diff --git a/themes/grav/templates/partials/themes-details.html.twig b/themes/grav/templates/partials/themes-details.html.twig
index d94315b6..a836f2d4 100644
--- a/themes/grav/templates/partials/themes-details.html.twig
+++ b/themes/grav/templates/partials/themes-details.html.twig
@@ -6,8 +6,8 @@
     {% set remote = gpm.getRepositoryTheme(admin.route) %}
         <p>
             <i class="fa fa-bullhorn"></i>
-            <strong>v{{ remote.available }}</strong> {{ "PLUGIN_ADMIN_OF_THIS_THEME_IS_NOW_AVAILABLE"|t }}!
-            <button class="button button-small secondary" data-download="{{ remote.zipball_url }}">{{ "PLUGIN_ADMIN_UPDATE_THEME"|t }}</button>
+            <strong>v{{ remote.available }}</strong> {{ "PLUGIN_ADMIN_OF_THIS_THEME_IS_NOW_AVAILABLE"|tu }}!
+            <button class="button button-small secondary" data-download="{{ remote.zipball_url }}">{{ "PLUGIN_ADMIN_UPDATE_THEME"|tu }}</button>
         </p>
     {% endif %}
 </div>
@@ -29,13 +29,13 @@
     <table>
         {% if theme.version %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_VERSION"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_VERSION"|tu }}:</td>
             <td>{{ theme.version }}</td>
         </tr>
         {% endif %}
         {% if theme.author %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_AUTHOR"|t }}:</td>
+                <td>{{ "PLUGIN_ADMIN_AUTHOR"|tu }}:</td>
                 <td>
                     {% if theme.author.url %}
                         <a href="{{ theme.author.url }}" target="_blank">{{ theme.author.name }}</a>
@@ -50,37 +50,37 @@
         {% endif %}
         {% if theme.homepage %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_HOMEPAGE"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_HOMEPAGE"|tu }}:</td>
             <td><a href="{{ theme.homepage }}" target="_blank">{{ theme.homepage }}</a></td>
         </tr>
         {% endif %}
         {% if theme.demo %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_DEMO"|t }}:</td>
+            <td>{{ "PLUGIN_ADMIN_DEMO"|tu }}:</td>
             <td><a href="{{ theme.demo }}" target="_blank">{{ theme.demo }}</a></td>
         </tr>
         {% endif %}
         {% if theme.bugs %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_BUG_TRACKER"|t }}:</td>
+                <td>{{ "PLUGIN_ADMIN_BUG_TRACKER"|tu }}:</td>
                 <td><a href="{{ theme.bugs }}" target="_blank">{{ theme.bugs }}</a></td>
             </tr>
         {% endif %}
         {% if theme.keywords %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_KEYWORDS"|t }}:</td>
+                <td>{{ "PLUGIN_ADMIN_KEYWORDS"|tu }}:</td>
                 <td>{{ theme.keywords }}</td>
             </tr>
         {% endif %}
         {% if theme.license %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_LICENCE"|t }}:</td>
+                <td>{{ "PLUGIN_ADMIN_LICENCE"|tu }}:</td>
                 <td>{{ theme.license }}</td>
             </tr>
         {% endif %}
         {% if theme.description %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_DESCRIPTION"|t }}:</td>
+                <td>{{ "PLUGIN_ADMIN_DESCRIPTION"|tu }}:</td>
                 <td>{{ theme.description_html }}</td>
             </tr>
         {% endif %}
@@ -88,7 +88,7 @@
         {% if theme.readme or theme.homepage %}
             {% set readme_link = theme.readme ?: theme.homepage ~ '/blob/develop/README.md' %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_README"|t }}:</td>
+                <td>{{ "PLUGIN_ADMIN_README"|tu }}:</td>
                 <td><a href="{{ readme_link }}" target="_blank">{{ readme_link }}</a></td>
             </tr>
         {% endif %}
@@ -102,12 +102,12 @@
     {% if (config.get('system.pages.theme') != admin.route) %}
     <div class="button-bar danger">
         <span class="danger-zone"></span>
-        <a class="button" href="{{ base_url_relative }}/themes/{{ theme.slug }}/task{{ config.system.param_sep }}uninstall"><i class="fa fa-fw fa-warning"></i>{{ "PLUGIN_ADMIN_REMOVE_THEME"|t }}</a>
+        <a class="button" href="{{ base_url_relative }}/themes/{{ theme.slug }}/task{{ config.system.param_sep }}uninstall"><i class="fa fa-fw fa-warning"></i>{{ "PLUGIN_ADMIN_REMOVE_THEME"|tu }}</a>
     </div>
     {% endif %}
 {% else %}
     <div class="button-bar success">
-        <a class="button" href="{{ base_url_relative }}/themes/{{ theme.slug }}/task{{ config.system.param_sep }}install"><i class="fa fa-fw fa-plus"></i>{{ "PLUGIN_ADMIN_INSTALL_THEME"|t }}</a>
+        <a class="button" href="{{ base_url_relative }}/themes/{{ theme.slug }}/task{{ config.system.param_sep }}install"><i class="fa fa-fw fa-plus"></i>{{ "PLUGIN_ADMIN_INSTALL_THEME"|tu }}</a>
     </div>
 {% endif %}
 
diff --git a/themes/grav/templates/partials/themes-list.html.twig b/themes/grav/templates/partials/themes-list.html.twig
index 0ab1edf3..f4e2e375 100644
--- a/themes/grav/templates/partials/themes-list.html.twig
+++ b/themes/grav/templates/partials/themes-list.html.twig
@@ -60,7 +60,7 @@
         </p>
         <br>
         <div class="button-bar">
-            <a class="button secondary remodal-cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|t }}</a>
-            <a class="button continue" href="#"><i class="fa fa-fw fa-check"></i>{{ "PLUGIN_ADMIN_CONTINUE"|t }}</a>
+            <a class="button secondary remodal-cancel" href="#"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN_CANCEL"|tu }}</a>
+            <a class="button continue" href="#"><i class="fa fa-fw fa-check"></i>{{ "PLUGIN_ADMIN_CONTINUE"|tu }}</a>
     </form>
 </div>
diff --git a/themes/grav/templates/plugins.html.twig b/themes/grav/templates/plugins.html.twig
index 6785acaf..f968899b 100644
--- a/themes/grav/templates/plugins.html.twig
+++ b/themes/grav/templates/plugins.html.twig
@@ -18,27 +18,27 @@
     {% if not admin.route or installing %}
         <div class="button-bar">
         {% if (installing) %}
-            <a class="button" href="{{ base_url_relative }}/plugins"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|t }}</a>
+            <a class="button" href="{{ base_url_relative }}/plugins"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|tu }}</a>
         {% else %}
-            <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|t }}</a>
-            <a class="button" href="{{ base_url_relative }}/plugins/install"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN_ADD"|t }}</a>
-            <button data-gpm-checkupdates="" class="button"><i class="fa fa-refresh"></i> {{ "PLUGIN_ADMIN_CHECK_FOR_UPDATES"|t }}</button>
+            <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|tu }}</a>
+            <a class="button" href="{{ base_url_relative }}/plugins/install"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN_ADD"|tu }}</a>
+            <button data-gpm-checkupdates="" class="button"><i class="fa fa-refresh"></i> {{ "PLUGIN_ADMIN_CHECK_FOR_UPDATES"|tu }}</button>
         {% endif %}
         </div>
         <h1><i class="fa fa-fw fa-plug"></i> Plugins</h1>
     {% else %}
         {% if (installed) %}
         <div class="button-bar">
-            <a class="button" href="{{ base_url_relative }}/plugins"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_PLUGINS"|t }}</a>
-            <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN_SAVE"|t }}</button>
+            <a class="button" href="{{ base_url_relative }}/plugins"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_PLUGINS"|tu }}</a>
+            <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN_SAVE"|tu }}</button>
         </div>
         {% else %}
         <div class="button-bar">
-            <a class="button" href="{{ base_url_relative }}/plugins/install"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_PLUGINS"|t }}</a>
+            <a class="button" href="{{ base_url_relative }}/plugins/install"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_PLUGINS"|tu }}</a>
         </div>
         {% endif %}
 
-        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_PLUGIN"|t }}: {{ plugin.name|e }}</h1>
+        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_PLUGIN"|tu }}: {{ plugin.name|e }}</h1>
 
     {% endif %}
 {% endblock %}
diff --git a/themes/grav/templates/reset.html.twig b/themes/grav/templates/reset.html.twig
index 3e805d8e..c971af8d 100644
--- a/themes/grav/templates/reset.html.twig
+++ b/themes/grav/templates/reset.html.twig
@@ -11,7 +11,7 @@
             {% endif %}
         {% endfor %}
         <div class="form-actions secondary-accent">
-            <button type="submit" class="button primary" name="task" value="reset"><i class="fa fa-key"></i> {{ 'LOGIN_BTN_RESET'|t }}</button>
+            <button type="submit" class="button primary" name="task" value="reset"><i class="fa fa-key"></i> {{ 'LOGIN_BTN_RESET'|tu }}</button>
         </div>
     {% endblock %}
 
diff --git a/themes/grav/templates/themes.html.twig b/themes/grav/templates/themes.html.twig
index eae3161e..648dae84 100644
--- a/themes/grav/templates/themes.html.twig
+++ b/themes/grav/templates/themes.html.twig
@@ -18,26 +18,26 @@
     {% if not admin.route or installing %}
         <div class="button-bar">
         {% if (installing) %}
-            <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|t }}</a>
+            <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|tu }}</a>
         {% else %}
-            <a class="button" href="{{ base_url }}/"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|t }}</a>
-            <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN_ADD"|t }}</a>
-            <button data-gpm-checkupdates="" class="button"><i class="fa fa-refresh"></i> {{ "PLUGIN_ADMIN_CHECK_FOR_UPDATES"|t }}</button>
+            <a class="button" href="{{ base_url }}/"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|tu }}</a>
+            <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN_ADD"|tu }}</a>
+            <button data-gpm-checkupdates="" class="button"><i class="fa fa-refresh"></i> {{ "PLUGIN_ADMIN_CHECK_FOR_UPDATES"|tu }}</button>
         {% endif %}
         </div>
-        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_THEMES"|t }}</h1>
+        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_THEMES"|tu }}</h1>
     {% else %}
         {% if (installed) %}
         <div class="button-bar">
-            <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_THEMES"|t }}</a>
-            <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN_SAVE"|t }}</button>
+            <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_THEMES"|tu }}</a>
+            <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN_SAVE"|tu }}</button>
         </div>
         {% else %}
         <div class="button-bar">
-            <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_THEMES"|t }}</a>
+            <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_THEMES"|tu }}</a>
         </div>
         {% endif %}
-        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_THEME"|t }}: {{ theme.name|e }}</h1>
+        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_THEME"|tu }}: {{ theme.name|e }}</h1>
     {% endif %}
 {% endblock %}