diff --git a/plugins/CorePluginsAdmin/stylesheets/marketplace.less b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
index 3226f63dbe5..d7961d397a8 100644
--- a/plugins/CorePluginsAdmin/stylesheets/marketplace.less
+++ b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
@@ -100,15 +100,18 @@
         width: 130px;
       }
     }
+
     ul {
       list-style: none;
       margin-left: 0;
       line-height: 140%;
     }
+
     .header {
       margin-top: 0px;
       margin-bottom: 15px;
     }
+
     .description {
       padding-bottom: 10px;
     }
@@ -209,4 +212,107 @@
     width: 250px;
     float: right;
   }
+}
+
+.pluginDetails {
+  font-size: 13px;
+  text-align: left;
+  font-family: Arial, Helvetica, sans-serif;
+  line-height: 20px;
+  
+  h3, h4, h5, h6 {
+    margin: 10px 0px;
+  }
+  
+  p, .ui-tabs-panel ul, .ui-tabs-panel li {
+    font-family: Arial, Helvetica, sans-serif;
+    text-align: left;
+    line-height: 20px;
+  }
+  
+  .header .intro {
+    margin-bottom: 15px;
+  }
+  
+  .content p {
+    margin: 0 0 10px;
+  }
+  
+  .description {
+    padding-right: 25px;
+  }
+  
+  .ui-tabs {
+    padding: 0em;
+  }
+  
+  .ui-tabs .ui-tabs-nav {
+    padding: 0em;
+    border-bottom: 1px solid #cccccc;
+    margin-right: 25px;
+    border-radius: 0px;
+    font-size: 15px;
+  }
+  
+  .ui-tabs .ui-tabs-panel {
+    padding: 1.4em 3em 0em 0em;
+  }
+  
+  .content a {
+    color: #255792;
+    text-decoration: none;
+  }
+  
+  .metadata dl {
+    padding-right: 25px;
+  }
+  
+  .metadata a:hover {
+    text-decoration: underline;
+  }
+  
+  .ui-state-default {
+    border: 0px !important;
+  }
+  
+  .ui-state-active {
+    padding-bottom: 0px !important;
+  }
+  
+  .ui-state-active.ui-state-default {
+    border: 1px solid #cccccc !important;
+  }
+  
+  .ui-state-default:hover {
+    background-color: #eeeeee !important;
+  }
+  
+  .install {
+    padding: 11px 19px;
+    font-size: 17.5px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+    color: #ffffff;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    background-color: #5bb75b;
+    display: inline-block;
+    text-decoration: none;
+  }
+
+  dt {
+    font-weight: bold;
+    line-height: 20px;
+  }
+  dd {
+    margin-left: 10px;
+    line-height: 20px;
+  }
+  
+  .featuredIcon {
+    height: 16px;
+    width: 16px;
+    margin-right: 5px;
+  }
+
 }
\ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index 36213ee3fce..6a45be04af5 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -42,7 +42,7 @@
 {% endmacro %}
 
 {% macro pluginDeveloper(owner) %}
-    {% if 'piwik' == owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="/plugins/Zeitgeist/images/logo-marketplace.png"/>{% else %}<strong>{{ owner }}</strong>{% endif %}
+    {% if 'piwik' == owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="/plugins/Zeitgeist/images/logo-marketplace.png"/>{% else %}{{ owner }}{% endif %}
 {% endmacro %}
 
 {% macro featuredIcon(align='') %}
diff --git a/plugins/CorePluginsAdmin/templates/pluginDetails.twig b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
index 2c09f17799d..dd1d03c28cc 100644
--- a/plugins/CorePluginsAdmin/templates/pluginDetails.twig
+++ b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
@@ -7,109 +7,6 @@
             {{ errorMessage }}
         {% elseif plugin %}
 
-            <style type="text/css">
-                .pluginDetails {
-                    font-size: 13px;
-                    text-align: left;
-                    font-family: Arial, Helvetica, sans-serif;
-                    line-height: 20px;
-                }
-
-                .pluginDetails h3, .pluginDetails h4, .pluginDetails h5, .pluginDetails h6 {
-                    margin: 10px 0px;
-                }
-
-                .pluginDetails p, .pluginDetails .ui-tabs-panel ul, .pluginDetails .ui-tabs-panel li {
-                    font-family: Arial, Helvetica, sans-serif;
-                    text-align: left;
-                    line-height: 20px;
-                }
-
-                .pluginDetails .header .intro {
-                    margin-bottom: 15px;
-                }
-
-                .pluginDetails .content p {
-                    margin: 0 0 10px;
-                }
-
-                .pluginDetails .description {
-                    padding-right: 25px;
-                }
-
-                .pluginDetails .ui-tabs {
-                    padding: 0em;
-                }
-
-                .pluginDetails .ui-tabs .ui-tabs-nav {
-                    padding: 0em;
-                    border-bottom: 1px solid #cccccc;
-                    margin-right: 25px;
-                    border-radius: 0px;
-                    font-size: 15px;
-                }
-
-                .pluginDetails .ui-tabs .ui-tabs-panel {
-                    padding: 1.4em 3em 0em 0em;
-                }
-
-                .pluginDetails .content a {
-                    color: #255792;
-                    text-decoration: none;
-                }
-
-                .pluginDetails .metadata dl {
-                    padding-right: 25px;
-                }
-
-                .pluginDetails .metadata a:hover {
-                    text-decoration: underline;
-                }
-
-                .pluginDetails .ui-state-default {
-                    border: 0px !important;
-                }
-
-                .pluginDetails .ui-state-active {
-                    padding-bottom: 0px !important;
-                }
-
-                .pluginDetails .ui-state-active.ui-state-default {
-                    border: 1px solid #cccccc !important;
-                }
-
-                .pluginDetails .ui-state-default:hover {
-                    background-color: #eeeeee !important;
-                }
-
-                .pluginDetails .install {
-                    padding: 11px 19px;
-                    font-size: 17.5px;
-                    -webkit-border-radius: 6px;
-                    -moz-border-radius: 6px;
-                    border-radius: 6px;
-                    color: #ffffff;
-                    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-                    background-color: #5bb75b;
-                    display: inline-block;
-                    text-decoration: none;
-                }
-                .pluginDetails dt {
-                    font-weight: bold;
-                    line-height: 20px;
-                }
-                .pluginDetails dd {
-                    margin-left: 10px;
-                    line-height: 20px;
-                }
-
-                .pluginDetails .featuredIcon {
-                    height: 16px;
-                    width: 16px;
-                    margin-right: 5px;
-                }
-            </style>
-
             <div class="header">
                 <div class="intro" style="width:75%;float:left;">
                     <h2>{{ plugin.name }}</h2>
@@ -217,7 +114,7 @@
                         <dt>Downloads</dt>
                         <dd title="Latest version: {{ plugin.versions[plugin.versions|length - 1].numDownloads|number_format }} Downloads">{{ plugin.numDownloads }}</dd>
                         <dt>Developer</dt>
-                        <dd>{% if 'piwik' == plugin.owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="/plugins/Zeitgeist/images/logo-marketplace.png"/>{% else %}<strong>{{ plugin.owner }}</strong>{% endif %}</dd>
+                        <dd>{{ pluginsMacro.pluginDeveloper(plugin.owner) }}</dd>
                         <dt>Authors</dt>
                         <dd>{% for author in plugin.authors if author.name %}
 
diff --git a/plugins/CorePluginsAdmin/templates/pluginMetadata.twig b/plugins/CorePluginsAdmin/templates/pluginMetadata.twig
index 22009469384..ec717558d99 100644
--- a/plugins/CorePluginsAdmin/templates/pluginMetadata.twig
+++ b/plugins/CorePluginsAdmin/templates/pluginMetadata.twig
@@ -5,5 +5,5 @@
     <li class="odd">{{ 'CorePluginsAdmin_Version'|translate }}: <strong>{{ plugin.latestVersion }}</strong></li>
     <li class="even">Updated: <strong>{{ plugin.lastUpdated }}</strong></li>
     <li class="odd">{{ 'General_Downloads'|translate }}: <strong>{{ plugin.numDownloads }}</strong></li>
-    <li class="even">Developer: {{ plugins.pluginDeveloper(plugin.owner) }}</li>
+    <li class="even">Developer: <strong>{{ plugins.pluginDeveloper(plugin.owner) }}</strong></li>
 </ul>
\ No newline at end of file