diff --git a/classes/admin.php b/classes/admin.php
index 8fb265c2..c0ab1a30 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -156,7 +156,7 @@ class Admin
 
                     $l = $this->grav['language'];
 
-                    $this->setMessage($l->translate('LOGIN_LOGGED_IN'), 'info');
+                    $this->setMessage($l->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info');
 
 //                    $redirect_route =$this->getLoginRedirect() ?: $this->uri->route();
                     $redirect_route = $this->uri->route();
diff --git a/classes/controller.php b/classes/controller.php
index c82ccfb1..8c501659 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -134,7 +134,7 @@ class AdminController
         if ($this->admin->authenticate($this->post)) {
             // should never reach here, redirects first
         } else {
-            $this->admin->setMessage($l->translate('LOGIN_FAILED'), 'error');
+            $this->admin->setMessage($l->translate('PLUGIN_ADMIN.LOGIN_FAILED'), 'error');
         }
 
         return true;
@@ -150,7 +150,7 @@ class AdminController
         $l = $this->grav['language'];
 
         $this->admin->session()->invalidate()->start();
-        $this->admin->setMessage($l->translate('LOGGED_OUT'), 'info');
+        $this->admin->setMessage($l->translate('PLUGIN_ADMIN.LOGGED_OUT'), 'info');
         $this->setRedirect('/logout');
 
         return true;
@@ -171,19 +171,19 @@ class AdminController
         $user = !empty($username) ? User::load($username) : null;
 
         if (!isset($this->grav['Email'])) {
-            $this->admin->setMessage($l->translate('FORGOT_EMAIL_NOT_CONFIGURED'), 'error');
+            $this->admin->setMessage($l->translate('PLUGIN_ADMIN.FORGOT_EMAIL_NOT_CONFIGURED'), 'error');
             $this->setRedirect('/');
             return true;
         }
 
         if (!$user || !$user->exists()) {
-            $this->admin->setMessage($l->translate(['FORGOT_USERNAME_DOES_NOT_EXIST', $username]), 'error');
+            $this->admin->setMessage($l->translate(['PLUGIN_ADMIN.FORGOT_USERNAME_DOES_NOT_EXIST', $username]), 'error');
             $this->setRedirect('/forgot');
             return true;
         }
 
         if (empty($user->email)) {
-            $this->admin->setMessage($l->translate(['FORGOT_CANNOT_RESET_EMAIL_NO_EMAIL', $username]), 'error');
+            $this->admin->setMessage($l->translate(['PLUGIN_ADMIN.FORGOT_CANNOT_RESET_EMAIL_NO_EMAIL', $username]), 'error');
             $this->setRedirect('/forgot');
             return true;
         }
@@ -202,8 +202,8 @@ class AdminController
         $from = $this->grav['config']->get('plugins.email.from', 'noreply@getgrav.org');
         $to = $user->email;
 
-        $subject = $l->translate(['FORGOT_EMAIL_SUBJECT', $sitename]);
-        $content = $l->translate(['FORGOT_EMAIL_BODY', $fullname, $reset_link, $author, $sitename]);
+        $subject = $l->translate(['PLUGIN_ADMIN.FORGOT_EMAIL_SUBJECT', $sitename]);
+        $content = $l->translate(['PLUGIN_ADMIN.FORGOT_EMAIL_BODY', $fullname, $reset_link, $author, $sitename]);
 
         $body = $this->grav['twig']->processTemplate('email/base.html.twig', ['content' => $content]);
 
@@ -214,9 +214,9 @@ class AdminController
         $sent = $this->grav['Email']->send($message);
 
         if ($sent < 1) {
-            $this->admin->setMessage($l->translate('FORGOT_FAILED_TO_EMAIL'), 'error');
+            $this->admin->setMessage($l->translate('PLUGIN_ADMIN.FORGOT_FAILED_TO_EMAIL'), 'error');
         } else {
-            $this->admin->setMessage($l->translate(['FORGOT_INSTRUCTIONS_SENT_VIA_EMAIL', $to]), 'info');
+            $this->admin->setMessage($l->translate(['PLUGIN_ADMIN.FORGOT_INSTRUCTIONS_SENT_VIA_EMAIL', $to]), 'info');
         }
 
         $this->setRedirect('/');
@@ -245,7 +245,7 @@ class AdminController
 
                 if ($good_token === $token) {
                     if (time() > $expire) {
-                        $this->admin->setMessage($l->translate('RESET_LINK_EXPIRED'), 'error');
+                        $this->admin->setMessage($l->translate('PLUGIN_ADMIN.RESET_LINK_EXPIRED'), 'error');
                         $this->setRedirect('/forgot');
                         return true;
                     }
@@ -258,13 +258,13 @@ class AdminController
                     $user->filter();
                     $user->save();
 
-                    $this->admin->setMessage($l->translate('RESET_PASSWORD_RESET'), 'info');
+                    $this->admin->setMessage($l->translate('PLUGIN_ADMIN.RESET_PASSWORD_RESET'), 'info');
                     $this->setRedirect('/');
                     return true;
                 }
             }
 
-            $this->admin->setMessage($l->translate('RESET_INVALID_LINK'), 'error');
+            $this->admin->setMessage($l->translate('PLUGIN_ADMIN.RESET_INVALID_LINK'), 'error');
             $this->setRedirect('/forgot');
             return true;
 
@@ -273,7 +273,7 @@ class AdminController
             $token = $this->grav['uri']->param('token');
 
             if (empty($user) || empty($token)) {
-                $this->admin->setMessage($l->translate('RESET_INVALID_LINK'), 'error');
+                $this->admin->setMessage($l->translate('PLUGIN_ADMIN.RESET_INVALID_LINK'), 'error');
                 $this->setRedirect('/forgot');
                 return true;
             }
diff --git a/languages.yaml b/languages.yaml
index bab3fd1c..94359f88 100644
--- a/languages.yaml
+++ b/languages.yaml
@@ -1,109 +1,110 @@
 en:
-  ADMIN_BETA_MSG: This is a Beta release! Use this in production at your own risk...
-  ADMIN_REPORT_ISSUE: Found an issue? Please report it on GitHub.
-  EMAIL_FOOTER: <a href="http://getgrav.org">Powered by Grav</a> - The Modern Flat File CMS
-  LOGIN_BTN: Login
-  LOGIN_BTN_FORGOT: Forgot
-  LOGIN_BTN_RESET: Reset Password
-  LOGIN_BTN_SEND_INSTRUCTIONS: Send Reset Instructions
-  LOGIN_LOGGED_IN: You have been successfully logged in
-  LOGIN_FAILED: Login failed
-  LOGGED_OUT: You have been logged out
-  RESET_LINK_EXPIRED: Reset link has expired, please try again
-  RESET_PASSWORD_RESET: Password has been reset
-  RESET_INVALID_LINK: Invalid reset link used, please try again
-  FORGOT_INSTRUCTIONS_SENT_VIA_EMAIL: Instructions to reset your password have been sent via email to %s
-  FORGOT_FAILED_TO_EMAIL: Failed to email instructions, please try again later
-  FORGOT_CANNOT_RESET_EMAIL_NO_EMAIL: Cannot reset password for %s, no email address is set
-  FORGOT_USERNAME_DOES_NOT_EXIST: User with username <b>%s</b> does not exist
-  FORGOT_EMAIL_NOT_CONFIGURED: Cannot reset password. This site is not configured to send emails
-  FORGOT_EMAIL_SUBJECT: %s Password Reset Request
-  FORGOT_EMAIL_BODY: <h1>Password Reset</h1><p>Dear %1$s,</p><p>A request was made on <b>%4$s</b> to reset your password.</p><p><br /><a href="%2$s" class="btn-primary">Click this to reset your password</a><br /><br /></p><p>Alternatively, copy the following URL into your browser's address bar:</p> <p>%2$s</p><p><br />Kind regards,<br /><br />%3$s</p>
-  PLUGIN_ADMIN_MANAGE_PAGES: Manage Pages
-  PLUGIN_ADMIN_CONFIGURATION: Configuration
-  PLUGIN_ADMIN_PAGES: Pages
-  PLUGIN_ADMIN_PLUGINS: Plugins
-  PLUGIN_ADMIN_PLUGIN: Plugin
-  PLUGIN_ADMIN_THEMES: Themes
-  PLUGIN_ADMIN_LOGOUT: Logout
-  PLUGIN_ADMIN_BACK: Back
-  PLUGIN_ADMIN_ADD_PAGE: Add Page
-  PLUGIN_ADMIN_ADD_MODULAR: Add Modular
-  PLUGIN_ADMIN_MOVE: Move
-  PLUGIN_ADMIN_DELETE: Delete
-  PLUGIN_ADMIN_SAVE: Save
-  PLUGIN_ADMIN_NORMAL: Normal
-  PLUGIN_ADMIN_EXPERT: Expert
-  PLUGIN_ADMIN_EXPAND_ALL: Expand All
-  PLUGIN_ADMIN_COLLAPSE_ALL: Collapse All
-  PLUGIN_ADMIN_ERROR: Error
-  PLUGIN_ADMIN_CLOSE: Close
-  PLUGIN_ADMIN_CANCEL: Cancel
-  PLUGIN_ADMIN_CONTINUE: Continue
-  PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_TITLE: Confirmation Required
-  PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC: Are you sure you want to delete this page and all it's children? This action cannot be undone.
-  PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_TITLE: Changes Detected
-  PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_DESC: You have unsaved changes.  Are you sure you want to leave without saving?
-  PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE: Confirmation Required
-  PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC: Are you sure you want to delete this file? This action cannot be undone.
-  PLUGIN_ADMIN_ADD_FILTERS: Add Filters
-  PLUGIN_ADMIN_SEARCH_PAGES: Search Pages
-  PLUGIN_ADMIN_VERSION: Version
-  PLUGIN_ADMIN_WAS_MADE_WITH: Was made with
-  PLUGIN_ADMIN_BY: By
-  PLUGIN_ADMIN_UPDATE_THEME: Update Theme
-  PLUGIN_ADMIN_UPDATE_PLUGIN: Update Plugin
-  PLUGIN_ADMIN_OF_THIS_THEME_IS_NOW_AVAILABLE: of this theme is now available
-  PLUGIN_ADMIN_OF_THIS_PLUGIN_IS_NOW_AVAILABLE: of this plugin is now available
-  PLUGIN_ADMIN_VERSION: Version
-  PLUGIN_ADMIN_AUTHOR: Author
-  PLUGIN_ADMIN_HOMEPAGE: Homepage
-  PLUGIN_ADMIN_DEMO: Demo
-  PLUGIN_ADMIN_BUG_TRACKER: Bug Tracker
-  PLUGIN_ADMIN_KEYWORDS: Keywords
-  PLUGIN_ADMIN_LICENCE: Licence
-  PLUGIN_ADMIN_DESCRIPTION: Description
-  PLUGIN_ADMIN_README: Readme
-  PLUGIN_ADMIN_REMOVE_THEME: Remove Theme
-  PLUGIN_ADMIN_INSTALL_THEME: Install Theme
-  PLUGIN_ADMIN_THEME: Theme
-  PLUGIN_ADMIN_BACK_TO_THEMES: Back to Themes
-  PLUGIN_ADMIN_BACK_TO_PLUGINS: Back to Plugins
-  PLUGIN_ADMIN_CHECK_FOR_UPDATES: Check for Updates
-  PLUGIN_ADMIN_ADD: Add
-  PLUGIN_ADMIN_CLEAR_CACHE: Clear Cache
-  PLUGIN_ADMIN_CLEAR_CACHE_ALL_CACHE: All Cache
-  PLUGIN_ADMIN_CLEAR_CACHE_ASSETS_ONLY: Assets Only
-  PLUGIN_ADMIN_CLEAR_CACHE_IMAGES_ONLY: Images Only
-  PLUGIN_ADMIN_CLEAR_CACHE_CACHE_ONLY: Cache Only
-  PLUGIN_ADMIN_CHECK_FOR_UPDATES: Check for Updates
-  PLUGIN_ADMIN_DASHBOARD: Dashboard
-  PLUGIN_ADMIN_UPDATES_AVAILABLE: Updates Available
-  PLUGIN_ADMIN_DAYS: Days
-  PLUGIN_ADMIN_UPDATE: Update
-  PLUGIN_ADMIN_BACKUP: Backup
-  PLUGIN_ADMIN_STATISTICS: Statistics
-  PLUGIN_ADMIN_TODAY: Today
-  PLUGIN_ADMIN_WEEK: Week
-  PLUGIN_ADMIN_MONTH: Month
-  PLUGIN_ADMIN_LATEST_PAGE_UPDATES: Latest Page Updates
-  PLUGIN_ADMIN_MAINTENANCE: Maintenance
-  PLUGIN_ADMIN_UPDATED: Updated
-  PLUGIN_ADMIN_MON: Mon
-  PLUGIN_ADMIN_TUE: Tue
-  PLUGIN_ADMIN_WED: Wed
-  PLUGIN_ADMIN_THU: Thu
-  PLUGIN_ADMIN_FRI: Fri
-  PLUGIN_ADMIN_SAT: Sat
-  PLUGIN_ADMIN_SUN: Sun
-  PLUGIN_ADMIN_COPY: Copy
-  PLUGIN_ADMIN_EDIT: Edit
-  PLUGIN_ADMIN_CREATE: Create
-  PLUGIN_ADMIN_GRAV_ADMIN: Grav Admin
-  PLUGIN_ADMIN_GRAV_OFFICIAL_PLUGIN: Grav Official Plugin
-  PLUGIN_ADMIN_SYMBOLICALLY_LINKED: This plugin is symbolically linked. Updates won't be detected.
-  PLUGIN_ADMIN_REMOVE_PLUGIN: Remove Plugin
-  PLUGIN_ADMIN_INSTALL_PLUGIN: Install Plugin
+  PLUGIN_ADMIN:
+    ADMIN_BETA_MSG: This is a Beta release! Use this in production at your own risk...
+    ADMIN_REPORT_ISSUE: Found an issue? Please report it on GitHub.
+    EMAIL_FOOTER: <a href="http://getgrav.org">Powered by Grav</a> - The Modern Flat File CMS
+    LOGIN_BTN: Login
+    LOGIN_BTN_FORGOT: Forgot
+    LOGIN_BTN_RESET: Reset Password
+    LOGIN_BTN_SEND_INSTRUCTIONS: Send Reset Instructions
+    LOGIN_LOGGED_IN: You have been successfully logged in
+    LOGIN_FAILED: Login failed
+    LOGGED_OUT: You have been logged out
+    RESET_LINK_EXPIRED: Reset link has expired, please try again
+    RESET_PASSWORD_RESET: Password has been reset
+    RESET_INVALID_LINK: Invalid reset link used, please try again
+    FORGOT_INSTRUCTIONS_SENT_VIA_EMAIL: Instructions to reset your password have been sent via email to %s
+    FORGOT_FAILED_TO_EMAIL: Failed to email instructions, please try again later
+    FORGOT_CANNOT_RESET_EMAIL_NO_EMAIL: Cannot reset password for %s, no email address is set
+    FORGOT_USERNAME_DOES_NOT_EXIST: User with username <b>%s</b> does not exist
+    FORGOT_EMAIL_NOT_CONFIGURED: Cannot reset password. This site is not configured to send emails
+    FORGOT_EMAIL_SUBJECT: %s Password Reset Request
+    FORGOT_EMAIL_BODY: <h1>Password Reset</h1><p>Dear %1$s,</p><p>A request was made on <b>%4$s</b> to reset your password.</p><p><br /><a href="%2$s" class="btn-primary">Click this to reset your password</a><br /><br /></p><p>Alternatively, copy the following URL into your browser's address bar:</p> <p>%2$s</p><p><br />Kind regards,<br /><br />%3$s</p>
+    MANAGE_PAGES: Manage Pages
+    CONFIGURATION: Configuration
+    PAGES: Pages
+    PLUGINS: Plugins
+    PLUGIN: Plugin
+    THEMES: Themes
+    LOGOUT: Logout
+    BACK: Back
+    ADD_PAGE: Add Page
+    ADD_MODULAR: Add Modular
+    MOVE: Move
+    DELETE: Delete
+    SAVE: Save
+    NORMAL: Normal
+    EXPERT: Expert
+    EXPAND_ALL: Expand All
+    COLLAPSE_ALL: Collapse All
+    ERROR: Error
+    CLOSE: Close
+    CANCEL: Cancel
+    CONTINUE: Continue
+    MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_TITLE: Confirmation Required
+    MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC: Are you sure you want to delete this page and all it's children? This action cannot be undone.
+    MODAL_CHANGED_DETECTED_TITLE: Changes Detected
+    MODAL_CHANGED_DETECTED_DESC: You have unsaved changes.  Are you sure you want to leave without saving?
+    MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE: Confirmation Required
+    MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC: Are you sure you want to delete this file? This action cannot be undone.
+    ADD_FILTERS: Add Filters
+    SEARCH_PAGES: Search Pages
+    VERSION: Version
+    WAS_MADE_WITH: Was made with
+    BY: By
+    UPDATE_THEME: Update Theme
+    UPDATE_PLUGIN: Update Plugin
+    OF_THIS_THEME_IS_NOW_AVAILABLE: of this theme is now available
+    OF_THIS_PLUGIN_IS_NOW_AVAILABLE: of this plugin is now available
+    VERSION: Version
+    AUTHOR: Author
+    HOMEPAGE: Homepage
+    DEMO: Demo
+    BUG_TRACKER: Bug Tracker
+    KEYWORDS: Keywords
+    LICENCE: Licence
+    DESCRIPTION: Description
+    README: Readme
+    REMOVE_THEME: Remove Theme
+    INSTALL_THEME: Install Theme
+    THEME: Theme
+    BACK_TO_THEMES: Back to Themes
+    BACK_TO_PLUGINS: Back to Plugins
+    CHECK_FOR_UPDATES: Check for Updates
+    ADD: Add
+    CLEAR_CACHE: Clear Cache
+    CLEAR_CACHE_ALL_CACHE: All Cache
+    CLEAR_CACHE_ASSETS_ONLY: Assets Only
+    CLEAR_CACHE_IMAGES_ONLY: Images Only
+    CLEAR_CACHE_CACHE_ONLY: Cache Only
+    CHECK_FOR_UPDATES: Check for Updates
+    DASHBOARD: Dashboard
+    UPDATES_AVAILABLE: Updates Available
+    DAYS: Days
+    UPDATE: Update
+    BACKUP: Backup
+    STATISTICS: Statistics
+    TODAY: Today
+    WEEK: Week
+    MONTH: Month
+    LATEST_PAGE_UPDATES: Latest Page Updates
+    MAINTENANCE: Maintenance
+    UPDATED: Updated
+    MON: Mon
+    TUE: Tue
+    WED: Wed
+    THU: Thu
+    FRI: Fri
+    SAT: Sat
+    SUN: Sun
+    COPY: Copy
+    EDIT: Edit
+    CREATE: Create
+    GRAV_ADMIN: Grav Admin
+    GRAV_OFFICIAL_PLUGIN: Grav Official Plugin
+    SYMBOLICALLY_LINKED: This plugin is symbolically linked. Updates won't be detected.
+    REMOVE_PLUGIN: Remove Plugin
+    INSTALL_PLUGIN: Install Plugin
 
 es:
   ADMIN_BETA_MSG: ¡Está es una versión Beta! Utilízala bajo tu propio riesgo...
@@ -128,106 +129,107 @@ es:
   FORGOT_EMAIL_BODY: <h1>Restablecimiento de contraseña</h1><p>Estimado %1$s,</p><p>Se ha realizado una petición el <b>%4$s</b> para restablecer tu contraseña.</p><p><br /><a href="%2$s" class="btn-primary">Pincha aquí para restablecer tu contraseña</a><br /><br /></p><p>Alternativamente, copia la siguiente URL en la barra de direcciones de tu navegador:</p> <p>%2$s</p><p><br />Atentamente,<br /><br />%3$s</p>
 
 it:
-  ADMIN_BETA_MSG: Questa è una versione beta! Usare in produzione a proprio rischio e pericolo…
-  ADMIN_REPORT_ISSUE: Trovato un problema? Per favore, apri un ticket su GitHub
-  EMAIL_FOOTER: <a href="http://getgrav.org">Powered by Grav</a> - The Modern Flat File CMS
-  LOGIN_BTN: Login
-  LOGIN_BTN_FORGOT: Reset password
-  LOGIN_BTN_RESET: Resetta la password
-  LOGIN_BTN_SEND_INSTRUCTIONS: Invia istruzioni di reset
-  LOGIN_LOGGED_IN: Login effettuato con successo
-  LOGIN_FAILED: Login fallito
-  LOGGED_OUT: Sei stato disconnesso
-  RESET_LINK_EXPIRED: Il link di reset è scaduto, ritenta per favore
-  RESET_PASSWORD_RESET: La password è stata resettata
-  RESET_INVALID_LINK: Il link di reset non è valido, ritenta per favore
-  FORGOT_INSTRUCTIONS_SENT_VIA_EMAIL: Le istruzioni per resettare la password sono state inviate via email a %s
-  FORGOT_FAILED_TO_EMAIL: Invio della email fallito, per favore ritenta più tardi
-  FORGOT_CANNOT_RESET_EMAIL_NO_EMAIL: Impossibile resettare la password per %s, nessun indirizzo email impostato
-  FORGOT_USERNAME_DOES_NOT_EXIST: L'utente con username <b>%s</b> non esiste
-  FORGOT_EMAIL_NOT_CONFIGURED: Impossibile resettare la password. Il sito non è configurato per inviare email
-  FORGOT_EMAIL_SUBJECT: %s Richiesta di reset password
-  FORGOT_EMAIL_BODY: <h1>Reset password</h1><p>Caro %1$s,</p><p>Una richiesta di reset password è stata effettuata su <b>%4$s</b>.</p><p><br /><a href="%2$s" class="btn-primary">Clicca qui per resettare la tua password</a><br /><br /></p><p>In alternativa, copia il seguente URL nella barra indirizzi del tuo browser:</p> <p>%2$s</p><p><br />Cordiali saluti,<br /><br />%3$s</p>
-  PLUGIN_ADMIN_MANAGE_PAGES: Gestione Pagine
-  PLUGIN_ADMIN_CONFIGURATION: Settaggi
-  PLUGIN_ADMIN_PAGES: Pagine
-  PLUGIN_ADMIN_PLUGINS: Plugin
-  PLUGIN_ADMIN_PLUGINS: Plugin
-  PLUGIN_ADMIN_THEMES: Temi
-  PLUGIN_ADMIN_LOGOUT: Logout
-  PLUGIN_ADMIN_BACK: Indietro
-  PLUGIN_ADMIN_ADD_PAGE: Aggiungi Pagina
-  PLUGIN_ADMIN_ADD_MODULAR: Aggiungi Modular
-  PLUGIN_ADMIN_MOVE: Sposta
-  PLUGIN_ADMIN_DELETE: Elimina
-  PLUGIN_ADMIN_SAVE: Salva
-  PLUGIN_ADMIN_NORMAL: Normale
-  PLUGIN_ADMIN_EXPERT: Esperto
-  PLUGIN_ADMIN_EXPAND_ALL: Espandi tutto
-  PLUGIN_ADMIN_COLLAPSE_ALL: Comprimi tutto
-  PLUGIN_ADMIN_ERROR: Errore
-  PLUGIN_ADMIN_CLOSE: Chiudi
-  PLUGIN_ADMIN_CANCEL: Cancella
-  PLUGIN_ADMIN_CONTINUE: Continua
-  PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_TITLE: Conferma richiesta
-  PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC: Sicuro di voler eliminare questa pagina e tutte le sue sottopagine? Questa azione non può essere annullata.
-  PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_TITLE: Rilevate modifiche
-  PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_DESC: Vi sono cambiamenti non salvati. Sicuro di voler lasciare la pagina senza salvare?
-  PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE: Conferma richiesta
-  PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC: Sicuro di voler eliminare questo file? Questa azione non può essere annullata.
-  PLUGIN_ADMIN_ADD_FILTERS: Aggiungi filtro
-  PLUGIN_ADMIN_SEARCH_PAGES: Cerca pagine
-  PLUGIN_ADMIN_VERSION: Versione
-  PLUGIN_ADMIN_WAS_MADE_WITH: Prodotta con il
-  PLUGIN_ADMIN_BY: Da
-  PLUGIN_ADMIN_UPDATE_THEME: Aggiorna tema
-  PLUGIN_ADMIN_OF_THIS_THEME_IS_NOW_AVAILABLE: di questo tema è ora disponibile
-  PLUGIN_ADMIN_VERSION: Versione
-  PLUGIN_ADMIN_AUTHOR: Autore
-  PLUGIN_ADMIN_HOMEPAGE: Homepage
-  PLUGIN_ADMIN_DEMO: Demo
-  PLUGIN_ADMIN_BUG_TRACKER: Bug Tracker
-  PLUGIN_ADMIN_KEYWORDS: Parole chiave
-  PLUGIN_ADMIN_LICENCE: Licenza
-  PLUGIN_ADMIN_DESCRIPTION: Descrizione
-  PLUGIN_ADMIN_README: Readme
-  PLUGIN_ADMIN_REMOVE_THEME: Rimuovo tema
-  PLUGIN_ADMIN_INSTALL_THEME: Installa tema
-  PLUGIN_ADMIN_THEME: Tema
-  PLUGIN_ADMIN_BACK_TO_THEMES: Torna ai temi
-  PLUGIN_ADMIN_BACK_TO_PLUGINS: Torna ai plugin
-  PLUGIN_ADMIN_CHECK_FOR_UPDATES: Controlla aggiornamenti
-  PLUGIN_ADMIN_ADD: Aggiungi
-  PLUGIN_ADMIN_CLEAR_CACHE: Pulisci cache
-  PLUGIN_ADMIN_CLEAR_CACHE_ALL_CACHE: Tutta la cache
-  PLUGIN_ADMIN_CLEAR_CACHE_ASSETS_ONLY: Solo asset
-  PLUGIN_ADMIN_CLEAR_CACHE_IMAGES_ONLY: Solo immagini
-  PLUGIN_ADMIN_CLEAR_CACHE_CACHE_ONLY: Solo cache
-  PLUGIN_ADMIN_CHECK_FOR_UPDATES: Controlla aggiornamenti
-  PLUGIN_ADMIN_DASHBOARD: Dashboard
-  PLUGIN_ADMIN_UPDATES_AVAILABLE: Aggiornamenti disponibili
-  PLUGIN_ADMIN_DAYS: Giorni
-  PLUGIN_ADMIN_UPDATE: Aggiorna
-  PLUGIN_ADMIN_BACKUP: Backup
-  PLUGIN_ADMIN_STATISTICS: Statistiche
-  PLUGIN_ADMIN_TODAY: Oggi
-  PLUGIN_ADMIN_WEEK: Settimana
-  PLUGIN_ADMIN_MONTH: Mese
-  PLUGIN_ADMIN_LATEST_PAGE_UPDATES: Ultimi aggiornamenti pagine
-  PLUGIN_ADMIN_MAINTENANCE: Manutenzione
-  PLUGIN_ADMIN_UPDATED: Aggiornato
-  PLUGIN_ADMIN_MON: Lun
-  PLUGIN_ADMIN_TUE: Mar
-  PLUGIN_ADMIN_WED: Mer
-  PLUGIN_ADMIN_THU: Gio
-  PLUGIN_ADMIN_FRI: Ven
-  PLUGIN_ADMIN_SAT: Sab
-  PLUGIN_ADMIN_SUN: Dom
-  PLUGIN_ADMIN_COPY: Copia
-  PLUGIN_ADMIN_EDIT: Modifica
-  PLUGIN_ADMIN_CREATE: Crea
-  PLUGIN_ADMIN_GRAV_ADMIN: Grav Admin
-  PLUGIN_ADMIN_GRAV_OFFICIAL_PLUGIN: Plugin Ufficiale Grav
-  PLUGIN_ADMIN_SYMBOLICALLY_LINKED: Questo plugin ha un link simbolico. Gli aggiornamenti non possono essere installati da qui
-  PLUGIN_ADMIN_REMOVE_PLUGIN: Rimuovi Plugin
-  PLUGIN_ADMIN_INSTALL_PLUGIN: Installa Plugin
+  PLUGIN_ADMIN:
+    ADMIN_BETA_MSG: Questa è una versione beta! Usare in produzione a proprio rischio e pericolo…
+    ADMIN_REPORT_ISSUE: Trovato un problema? Per favore, apri un ticket su GitHub
+    EMAIL_FOOTER: <a href="http://getgrav.org">Powered by Grav</a> - The Modern Flat File CMS
+    LOGIN_BTN_SEND_INSTRUCTIONS: Invia istruzioni di reset
+    LOGIN_LOGGED_IN: Login effettuato con successo
+    LOGIN_FAILED: Login fallito
+    LOGGED_OUT: Sei stato disconnesso
+    RESET_LINK_EXPIRED: Il link di reset è scaduto, ritenta per favore
+    RESET_PASSWORD_RESET: La password è stata resettata
+    RESET_INVALID_LINK: Il link di reset non è valido, ritenta per favore
+    FORGOT_INSTRUCTIONS_SENT_VIA_EMAIL: Le istruzioni per resettare la password sono state inviate via email a %s
+    FORGOT_FAILED_TO_EMAIL: Invio della email fallito, per favore ritenta più tardi
+    FORGOT_CANNOT_RESET_EMAIL_NO_EMAIL: Impossibile resettare la password per %s, nessun indirizzo email impostato
+    FORGOT_USERNAME_DOES_NOT_EXIST: L'utente con username <b>%s</b> non esiste
+    FORGOT_EMAIL_NOT_CONFIGURED: Impossibile resettare la password. Il sito non è configurato per inviare email
+    FORGOT_EMAIL_SUBJECT: %s Richiesta di reset password
+    FORGOT_EMAIL_BODY: <h1>Reset password</h1><p>Caro %1$s,</p><p>Una richiesta di reset password è stata effettuata su <b>%4$s</b>.</p><p><br /><a href="%2$s" class="btn-primary">Clicca qui per resettare la tua password</a><br /><br /></p><p>In alternativa, copia il seguente URL nella barra indirizzi del tuo browser:</p> <p>%2$s</p><p><br />Cordiali saluti,<br /><br />%3$s</p>
+    LOGIN_BTN: Login
+    LOGIN_BTN_FORGOT: Reset password
+    LOGIN_BTN_RESET: Resetta la password
+    MANAGE_PAGES: Gestione Pagine
+    CONFIGURATION: Settaggi
+    PAGES: Pagine
+    PLUGINS: Plugin
+    PLUGINS: Plugin
+    THEMES: Temi
+    LOGOUT: Logout
+    BACK: Indietro
+    ADD_PAGE: Aggiungi Pagina
+    ADD_MODULAR: Aggiungi Modular
+    MOVE: Sposta
+    DELETE: Elimina
+    SAVE: Salva
+    NORMAL: Normale
+    EXPERT: Esperto
+    EXPAND_ALL: Espandi tutto
+    COLLAPSE_ALL: Comprimi tutto
+    ERROR: Errore
+    CLOSE: Chiudi
+    CANCEL: Cancella
+    CONTINUE: Continua
+    MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_TITLE: Conferma richiesta
+    MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC: Sicuro di voler eliminare questa pagina e tutte le sue sottopagine? Questa azione non può essere annullata.
+    MODAL_CHANGED_DETECTED_TITLE: Rilevate modifiche
+    MODAL_CHANGED_DETECTED_DESC: Vi sono cambiamenti non salvati. Sicuro di voler lasciare la pagina senza salvare?
+    MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE: Conferma richiesta
+    MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC: Sicuro di voler eliminare questo file? Questa azione non può essere annullata.
+    ADD_FILTERS: Aggiungi filtro
+    SEARCH_PAGES: Cerca pagine
+    VERSION: Versione
+    WAS_MADE_WITH: Prodotta con il
+    BY: Da
+    UPDATE_THEME: Aggiorna tema
+    OF_THIS_THEME_IS_NOW_AVAILABLE: di questo tema è ora disponibile
+    VERSION: Versione
+    AUTHOR: Autore
+    HOMEPAGE: Homepage
+    DEMO: Demo
+    BUG_TRACKER: Bug Tracker
+    KEYWORDS: Parole chiave
+    LICENCE: Licenza
+    DESCRIPTION: Descrizione
+    README: Readme
+    REMOVE_THEME: Rimuovo tema
+    INSTALL_THEME: Installa tema
+    THEME: Tema
+    BACK_TO_THEMES: Torna ai temi
+    BACK_TO_PLUGINS: Torna ai plugin
+    CHECK_FOR_UPDATES: Controlla aggiornamenti
+    ADD: Aggiungi
+    CLEAR_CACHE: Pulisci cache
+    CLEAR_CACHE_ALL_CACHE: Tutta la cache
+    CLEAR_CACHE_ASSETS_ONLY: Solo asset
+    CLEAR_CACHE_IMAGES_ONLY: Solo immagini
+    CLEAR_CACHE_CACHE_ONLY: Solo cache
+    CHECK_FOR_UPDATES: Controlla aggiornamenti
+    DASHBOARD: Dashboard
+    UPDATES_AVAILABLE: Aggiornamenti disponibili
+    DAYS: Giorni
+    UPDATE: Aggiorna
+    BACKUP: Backup
+    STATISTICS: Statistiche
+    TODAY: Oggi
+    WEEK: Settimana
+    MONTH: Mese
+    LATEST_PAGE_UPDATES: Ultimi aggiornamenti pagine
+    MAINTENANCE: Manutenzione
+    UPDATED: Aggiornato
+    MON: Lun
+    TUE: Mar
+    WED: Mer
+    THU: Gio
+    FRI: Ven
+    SAT: Sab
+    SUN: Dom
+    COPY: Copia
+    EDIT: Modifica
+    CREATE: Crea
+    GRAV_ADMIN: Grav Admin
+    GRAV_OFFICIAL_PLUGIN: Plugin Ufficiale Grav
+    SYMBOLICALLY_LINKED: Questo plugin ha un link simbolico. Gli aggiornamenti non possono essere installati da qui
+    REMOVE_PLUGIN: Rimuovi Plugin
+    INSTALL_PLUGIN: Installa Plugin
diff --git a/themes/grav/templates/dashboard.html.twig b/themes/grav/templates/dashboard.html.twig
index e9237004..0139dcd9 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"|tu }}</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"|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>
+                <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"|tu }}</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"|tu }}</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"|tu }}</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"|tu|lower }}</em></span>
+                            <span class="numeric"><span>-</span><em>{{ "PLUGIN_ADMIN.UPDATED"|tu|lower }}</em></span>
                         </div>
-                        <p>{{ "PLUGIN_ADMIN_UPDATES_AVAILABLE"|tu }}</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"|tu|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"|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>
+                    <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"|tu }}</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"|tu }}</i>
+                        <i>{{ "PLUGIN_ADMIN.TODAY"|tu }}</i>
                     </span>
                     <span class="stat">
                         <b>{{ popularity.getWeeklyTotal }}</b>
-                        <i>{{ "PLUGIN_ADMIN_WEEK"|tu }}</i>
+                        <i>{{ "PLUGIN_ADMIN.WEEK"|tu }}</i>
                     </span>
                     <span class="stat">
                         <b>{{ popularity.getMonthlyTotal }}</b>
-                        <i>{{ "PLUGIN_ADMIN_MONTH"|tu }}</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'|tu }}</div>
+    <div class="error alert"><i class="fa fa-exclamation-circle"></i> {{ 'PLUGIN_ADMIN.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"|tu }}</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"|tu }}</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 91edfc55..5c177d5c 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'|tu }}
+                            {{ 'PLUGIN_ADMIN.EMAIL_FOOTER'|tu }}
                         </td>
                     </tr>
                 </table>
diff --git a/themes/grav/templates/forgot.html.twig b/themes/grav/templates/forgot.html.twig
index 48920d1f..44c8506b 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"|tu }}</button>
+            <button type="submit" class="button primary" name="task" value="forgot"><i class="fa fa-paper-plane"></i> {{ "PLUGIN_ADMIN.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 6a47867f..635c768b 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'|tu }}</a>
-                <button type="submit" class="button primary" name="task" value="login"><i class="fa fa-sign-in"></i> {{ 'LOGIN_BTN'|tu }}</button>
+                <a class="button secondary" href="{{ base_url_relative }}/forgot"><i class="fa fa-exclamation-circle"></i> {{ 'PLUGIN_ADMIN.LOGIN_BTN_FORGOT'|tu }}</a>
+                <button type="submit" class="button primary" name="task" value="login"><i class="fa fa-sign-in"></i> {{ 'PLUGIN_ADMIN.LOGIN_BTN'|tu }}</button>
             </div>
     {% endblock %}
 
diff --git a/themes/grav/templates/logout.html.twig b/themes/grav/templates/logout.html.twig
index aad1682b..2cec3365 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'|tu }}</div>
+        <div class="info alert">{{ 'PLUGIN_ADMIN.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 5cdc6091..e2f964e2 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"|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>
+            <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"|tu }}</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"|tu }}</a>
-                <a class="button" href="#" data-remodal-target="move"><i class="fa fa-arrows"></i> {{ "PLUGIN_ADMIN_MOVE"|tu }}</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"|tu }}</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"|tu }}</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"|tu }}</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"|tu ~ " '#{context.menu}'" ~ preview_link : "PLUGIN_ADMIN_CREATE"|tu ~ " '#{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"|tu }}</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"|tu }}</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"|tu }}</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"|tu }}" 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"|tu }}" 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"|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>
+                <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"|tu }}</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"|tu }}</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"|tu }}</h1>
+            <h1>{{ "PLUGIN_ADMIN.MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_TITLE"|tu }}</h1>
             <p class="bigger">
-              {{ "PLUGIN_ADMIN_MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC"|tu }}
+              {{ "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"|tu }}</a>
-            <a class="button" data-delete-action href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|tu }}</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"|tu }}</h1>
+            <h1>{{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_TITLE"|tu }}</h1>
             <p class="bigger">
-                {{ "PLUGIN_ADMIN_MODAL_CHANGED_DETECTED_DESC"|tu }}
+                {{ "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"|tu }}</a>
-            <a class="button" data-leave-action="continue" href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|tu }}</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"|tu }}</h1>
+            <h1>{{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|tu }}</h1>
             <p class="bigger">
-                {{ "PLUGIN_ADMIN_MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC"|tu }}
+                {{ "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"|tu }}</a>
-            <a class="button remodal-confirm" href="#"><i class="fa fa-fw fa-check"></i> {{ "PLUGIN_ADMIN_CONTINUE"|tu }}</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 12e56349..72518509 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'|tu }}</a></div>
+                    <div class="notice alert"><i class="fa fa-github"></i> <a href="https://github.com/getgrav/grav-plugin-admin/issues">{{ 'PLUGIN_ADMIN.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"|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>.
+                    <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 06f52ef3..421e83fa 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"|tu }}</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 20d235ec..3a188ad4 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"|tu }}</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"|tu }}</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"|tu }}</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"|tu }}
+                <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"|tu }}
+                <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"|tu }}
+                <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"|tu }}</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 800dbe6e..81d433f2 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"|tu }}</a>
-        <button class="button primary" name="task" value="continue" form="blueprints">{{ "PLUGIN_ADMIN_CONTINUE"|tu }}</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 0504aeeb..537ba6cd 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"|tu }}:</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"|tu }}:</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"|tu }}:</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"|tu }}:</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"|tu }}:</td>
+            <td>{{ "PLUGIN_ADMIN.KEYWORDS"|tu }}:</td>
             <td>{{ plugin.keywords|join(', ') }}</td>
         </tr>
     {% endif %}
     {% if plugin.license %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_LICENSE"|tu }}:</td>
+            <td>{{ "PLUGIN_ADMIN.LICENSE"|tu }}:</td>
             <td>{{ plugin.license }}</td>
         </tr>
     {% endif %}
 
     {% if plugin.description %}
         <tr>
-            <td>{{ "PLUGIN_ADMIN_DESCRIPTION"|tu }}:</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"|tu }}:</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 b5cc84f9..5d63eef7 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"|tu }}!
-            <button class="button button-small secondary" data-download="{{ remote.zipball_url }}">{{ "PLUGIN_ADMIN_UPDATE_PLUGIN"|tu }}</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"|tu }}"></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"|tu }}">
+    <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"|tu }}</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"|tu }}</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 a836f2d4..9b61af0b 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"|tu }}!
-            <button class="button button-small secondary" data-download="{{ remote.zipball_url }}">{{ "PLUGIN_ADMIN_UPDATE_THEME"|tu }}</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"|tu }}:</td>
+            <td>{{ "PLUGIN_ADMIN.VERSION"|tu }}:</td>
             <td>{{ theme.version }}</td>
         </tr>
         {% endif %}
         {% if theme.author %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_AUTHOR"|tu }}:</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"|tu }}:</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"|tu }}:</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"|tu }}:</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"|tu }}:</td>
+                <td>{{ "PLUGIN_ADMIN.KEYWORDS"|tu }}:</td>
                 <td>{{ theme.keywords }}</td>
             </tr>
         {% endif %}
         {% if theme.license %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_LICENCE"|tu }}:</td>
+                <td>{{ "PLUGIN_ADMIN.LICENCE"|tu }}:</td>
                 <td>{{ theme.license }}</td>
             </tr>
         {% endif %}
         {% if theme.description %}
             <tr>
-                <td>{{ "PLUGIN_ADMIN_DESCRIPTION"|tu }}:</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"|tu }}:</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"|tu }}</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"|tu }}</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 f4e2e375..73d04db9 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"|tu }}</a>
-            <a class="button continue" href="#"><i class="fa fa-fw fa-check"></i>{{ "PLUGIN_ADMIN_CONTINUE"|tu }}</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 f968899b..b680e156 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"|tu }}</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"|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>
+            <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"|tu }}</a>
-            <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN_SAVE"|tu }}</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"|tu }}</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"|tu }}: {{ 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 c971af8d..fefb7d74 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'|tu }}</button>
+            <button type="submit" class="button primary" name="task" value="reset"><i class="fa fa-key"></i> {{ 'PLUGIN_ADMIN.LOGIN_BTN_RESET'|tu }}</button>
         </div>
     {% endblock %}
 
diff --git a/themes/grav/templates/themes.html.twig b/themes/grav/templates/themes.html.twig
index 648dae84..0304436a 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"|tu }}</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"|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>
+            <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"|tu }}</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"|tu }}</a>
-            <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN_SAVE"|tu }}</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"|tu }}</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"|tu }}: {{ theme.name|e }}</h1>
+        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN.THEME"|tu }}: {{ theme.name|e }}</h1>
     {% endif %}
 {% endblock %}