diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36066a70..f6e3884c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # v1.10.0-rc.18
 ## mm/dd/2020
 
+1. [](#improved)
+    * Auto-link a plugin/theme license in details if it starts with `http`
+    * Don't link to readme unless a `readme:` is provided in blueprint
 1. [](#bugfix)
     * Fixed Safari issue with new ACL picker field [#1955](https://github.com/getgrav/grav-plugin-admin/issues/1955)
 
diff --git a/themes/grav/templates/partials/plugin-data.html.twig b/themes/grav/templates/partials/plugin-data.html.twig
index 6ce89d23..daf7ccad 100644
--- a/themes/grav/templates/partials/plugin-data.html.twig
+++ b/themes/grav/templates/partials/plugin-data.html.twig
@@ -41,7 +41,11 @@
     {% if plugin.license %}
         <tr>
             <td>{{ "PLUGIN_ADMIN.LICENSE"|tu }}:</td>
-            <td class="double">{{ plugin.license }}</td>
+            {% if plugin.license|starts_with('http') %}
+                <td class="double"><a href="{{ plugin.license }}" target="_blank">{{ plugin.license }}</a></td>
+            {% else %}
+                <td class="double">{{ plugin.license }}</td>
+            {% endif %}
         </tr>
     {% endif %}
 
@@ -52,8 +56,8 @@
         </tr>
     {% endif %}
 
-    {% if plugin.readme or plugin.homepage %}
-        {% set readme_link = plugin.readme ?: plugin.docs|default(plugin.homepage ~ '/blob/master/README.md') %}
+    {% if plugin.readme %}
+        {% set readme_link = plugin.readme %}
         <tr>
             <td>{{ "PLUGIN_ADMIN.README"|tu }}:</td>
             <td class="double"><a href="{{ readme_link }}" target="_blank" rel="noopener noreferrer">{{ readme_link }}</a></td>
diff --git a/themes/grav/templates/partials/themes-details.html.twig b/themes/grav/templates/partials/themes-details.html.twig
index 7cfdf466..5bfb2f5d 100644
--- a/themes/grav/templates/partials/themes-details.html.twig
+++ b/themes/grav/templates/partials/themes-details.html.twig
@@ -74,7 +74,11 @@
         {% if theme.license %}
             <tr>
                 <td>{{ "PLUGIN_ADMIN.LICENSE"|tu }}:</td>
-                <td class="double">{{ theme.license }}</td>
+                {% if theme.license|starts_with('http') %}
+                    <td class="double"><a href="{{ theme.license }}" target="_blank">{{ theme.license }}</a></td>
+                {% else %}
+                    <td class="double">{{ theme.license }}</td>
+                {% endif %}
             </tr>
         {% endif %}
         {% if theme.description %}
@@ -84,8 +88,8 @@
             </tr>
         {% endif %}
 
-        {% if theme.readme or theme.homepage %}
-            {% set readme_link = theme.readme ?: theme.homepage ~ '/blob/master/README.md' %}
+        {% if theme.readme %}
+            {% set readme_link = theme.readme %}
             <tr>
                 <td>{{ "PLUGIN_ADMIN.README"|tu }}:</td>
                 <td class="double"><a href="{{ readme_link }}" target="_blank" rel="noopener noreferrer">{{ readme_link }}</a></td>