diff --git a/classes/admin.php b/classes/admin.php
index ef6190f8..bf0f8447 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -9,6 +9,7 @@ use Grav\Common\Uri;
 use Grav\Common\Page\Pages;
 use Grav\Common\Page\Page;
 use Grav\Common\Data;
+use Grav\Common\GPM\Local\Packages as LocalPackages;
 use RocketTheme\Toolbox\File\File;
 use RocketTheme\Toolbox\File\LogFile;
 use RocketTheme\Toolbox\File\YamlFile;
@@ -63,6 +64,11 @@ class Admin
      */
     public $user;
 
+    /**
+     * @var Packages
+     */
+    public $localPackages;
+
 
     /**
      * Constructor.
@@ -282,9 +288,15 @@ class Admin
      */
     public function themes()
     {
+        if (!$this->localPackages) {
+            $this->localPackages = new LocalPackages();
+        }
+
+        return $this->localPackages['themes']->toArray();
+
         /** @var Themes $themes */
-        $themes = $this->grav['themes'];
-        return $themes->all();
+        /*$themes = $this->grav['themes'];
+        return $themes->all();*/
     }
 
     /**
@@ -306,9 +318,15 @@ class Admin
      */
     public function plugins()
     {
+        if (!$this->localPackages) {
+            $this->localPackages = new LocalPackages();
+        }
+
+        return $this->localPackages['plugins'];
+
         /** @var Plugins $plugins */
-        $plugins = $this->grav['plugins'];
-        return $plugins->all();
+        /*$plugins = $this->grav['plugins'];
+        return $plugins->all();*/
     }
 
     /**
@@ -335,7 +353,7 @@ class Admin
      * @param  integer $count number of pages to pull back
      * @return array
      */
-    public function latestPages($count=10)
+    public function latestPages($count = 10)
     {
         /** @var Pages $pages */
         $pages = $this->grav['pages'];
@@ -348,7 +366,7 @@ class Admin
         }
 
         // sort based on modified
-        uasort($latest, function($a, $b) {
+        uasort($latest, function ($a, $b) {
             if ($a['modified'] == $b['modified']) {
                 return 0;
             }
@@ -437,5 +455,4 @@ class Admin
     {
         return dirname('/' . Grav::instance()['admin']->route);
     }
-
 }
diff --git a/themes/grav/templates/plugins.html.twig b/themes/grav/templates/plugins.html.twig
index 51003824..cab4fd7e 100644
--- a/themes/grav/templates/plugins.html.twig
+++ b/themes/grav/templates/plugins.html.twig
@@ -12,18 +12,19 @@
         {% include 'partials/messages.html.twig' %}
 
         <table>
-            {% for plugin in admin.plugins %}
-            {% set blueprints = plugin.blueprints() %}
+            {% for slug, package in admin.plugins %}
+            {% set plugin = package.toArray() %}
+            {% set data   = package.getData() %}
 
             <tr>
                 <td>
-                    <a href="{{ base_url_relative }}/plugins/{{ blueprints.name|url_encode }}">{{ blueprints.get('name') }}</a>
+                    <a href="{{ base_url_relative }}/plugins/{{ slug|url_encode }}">{{ plugin.name }}</a>
                 </td>
                 <td>
-                    <form action="{{ base_url_relative }}/plugins/{{ blueprints.name }}" method="post">
+                    <form action="{{ base_url_relative }}/plugins/{{ slug }}" method="post">
                         <input type="hidden" name="enabled" value="{{ plugin.get('enabled') ? 0 : 1 }}" />
                         <input type="hidden" name="_redirect" value="plugins" />
-                        <button class="button" name="task" value="enable"{{ blueprints.name == 'admin' ? ' disabled="disabled"' }}>
+                        <button class="button" name="task" value="enable"{{ slug == 'admin' ? ' disabled="disabled"' }}>
                             {{ plugin.get('enabled') ? 'Enabled' : 'Disabled' }}
                         </button>
                     </form>
@@ -32,18 +33,24 @@
             {% endfor %}
         </table>
         {% else %}
-        {% set plugin = admin.plugins[admin.route] %}
-        {% set blueprints = plugin.blueprints() %}
+        {% set package = admin.plugins[admin.route] %}
+        {% set plugin     = package.toArray() %}
+
 
         <h1>
-            {{ blueprints.get('name')|e }}
-            <small>{{ blueprints.get('version') ? 'v' ~ blueprints.get('version')|e }}</small>
+            {{ plugin.name|e }}
+            <small>{{ plugin.version ? 'v' ~ plugin.version|e }}</small>
+{{ dump(plugin) }}
+            <small>{{ plugin.icon }}</small>
+            <small>{{ plugin.homepage }}</small>
+            <small>{{ plugin.author.name }}</small>
+            <small>{{ plugin.author.email }}</small>
         </h1>
 
         {% include 'partials/messages.html.twig' %}
-        <p>{{ blueprints.get('description') }}</p>
+        <p>{{ plugin.description }}</p>
 
-        {% include 'partials/blueprints.html.twig' with { data: plugin } %}
+        {% include 'partials/blueprints.html.twig' with { data: plugin.form, blueprints: plugin.form } %}
         {% endif %}
     </div>
 {% endblock %}