diff --git a/languages.yaml b/languages.yaml
index d441ed5d..5be6103c 100644
--- a/languages.yaml
+++ b/languages.yaml
@@ -50,7 +50,23 @@ en:
   PLUGIN_ADMIN_VERSION: Version
   PLUGIN_ADMIN_WAS_MADE_WITH: Was made with
   PLUGIN_ADMIN_BY: By
-
+  PLUGIN_ADMIN_UPDATE_THEME: Update Theme
+  PLUGIN_ADMIN_OF_THIS_THEME_IS_NOW_AVAILABLE: of this theme 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_CHECK_FOR_UPDATES: Check for Updates
+  PLUGIN_ADMIN_ADD: Add
 
 es:
   ADMIN_BETA_MSG: ¡Está es una versión Beta! Utilízala bajo tu propio riesgo...
@@ -126,3 +142,20 @@ it:
   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_CHECK_FOR_UPDATES: Controlla aggiornamenti
+  PLUGIN_ADMIN_ADD: Aggiungi
diff --git a/themes/grav/templates/partials/themes-details.html.twig b/themes/grav/templates/partials/themes-details.html.twig
index 4fe2a923..d94315b6 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> of this theme is now available!
-            <button class="button button-small secondary" data-download="{{ remote.zipball_url }}">Update Theme</button>
+            <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>
         </p>
     {% endif %}
 </div>
@@ -29,13 +29,13 @@
     <table>
         {% if theme.version %}
         <tr>
-            <td>Version:</td>
+            <td>{{ "PLUGIN_ADMIN_VERSION"|t }}:</td>
             <td>{{ theme.version }}</td>
         </tr>
         {% endif %}
         {% if theme.author %}
             <tr>
-                <td>Author:</td>
+                <td>{{ "PLUGIN_ADMIN_AUTHOR"|t }}:</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>Homepage:</td>
+            <td>{{ "PLUGIN_ADMIN_HOMEPAGE"|t }}:</td>
             <td><a href="{{ theme.homepage }}" target="_blank">{{ theme.homepage }}</a></td>
         </tr>
         {% endif %}
         {% if theme.demo %}
         <tr>
-            <td>Demo:</td>
+            <td>{{ "PLUGIN_ADMIN_DEMO"|t }}:</td>
             <td><a href="{{ theme.demo }}" target="_blank">{{ theme.demo }}</a></td>
         </tr>
         {% endif %}
         {% if theme.bugs %}
             <tr>
-                <td>Bug Tracker:</td>
+                <td>{{ "PLUGIN_ADMIN_BUG_TRACKER"|t }}:</td>
                 <td><a href="{{ theme.bugs }}" target="_blank">{{ theme.bugs }}</a></td>
             </tr>
         {% endif %}
         {% if theme.keywords %}
             <tr>
-                <td>Keywords:</td>
+                <td>{{ "PLUGIN_ADMIN_KEYWORDS"|t }}:</td>
                 <td>{{ theme.keywords }}</td>
             </tr>
         {% endif %}
         {% if theme.license %}
             <tr>
-                <td>License:</td>
+                <td>{{ "PLUGIN_ADMIN_LICENCE"|t }}:</td>
                 <td>{{ theme.license }}</td>
             </tr>
         {% endif %}
         {% if theme.description %}
             <tr>
-                <td>Description:</td>
+                <td>{{ "PLUGIN_ADMIN_DESCRIPTION"|t }}:</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>Readme:</td>
+                <td>{{ "PLUGIN_ADMIN_README"|t }}:</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>Remove Theme</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"|t }}</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>Install Theme</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"|t }}</a>
     </div>
 {% endif %}
 
diff --git a/themes/grav/templates/themes.html.twig b/themes/grav/templates/themes.html.twig
index 0e9d8e21..eae3161e 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> Back</a>
+            <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN_BACK"|t }}</a>
         {% else %}
-            <a class="button" href="{{ base_url }}/"><i class="fa fa-reply"></i> Back</a>
-            <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-plus"></i> Add</a>
-            <button data-gpm-checkupdates="" class="button"><i class="fa fa-refresh"></i> Check for Updates</button>
+            <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>
         {% endif %}
         </div>
-        <h1><i class="fa fa-fw fa-plug"></i> Themes</h1>
+        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_THEMES"|t }}</h1>
     {% else %}
         {% if (installed) %}
         <div class="button-bar">
-            <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-arrow-left"></i> Back to Themes</a>
-            <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> Save</button>
+            <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>
         </div>
         {% else %}
         <div class="button-bar">
-            <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-arrow-left"></i> Back to Themes</a>
+            <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-arrow-left"></i> {{ "PLUGIN_ADMIN_BACK_TO_THEMES"|t }}</a>
         </div>
         {% endif %}
-        <h1><i class="fa fa-fw fa-plug"></i> Theme: {{ theme.name|e }}</h1>
+        <h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN_THEME"|t }}: {{ theme.name|e }}</h1>
     {% endif %}
 {% endblock %}