diff --git a/admin/themes/default/template/themes_installed.tpl b/admin/themes/default/template/themes_installed.tpl
index d2a37d5e9..70b00bcb8 100644
--- a/admin/themes/default/template/themes_installed.tpl
+++ b/admin/themes/default/template/themes_installed.tpl
@@ -1,3 +1,10 @@
+{include file='include/colorbox.inc.tpl'} 
+{footer_script}{literal}
+jQuery(document).ready(function() {
+  $("a.preview-box").colorbox(); 
+}); 
+{/literal}{/footer_script}
+
 <div class="titrePage">
   <h2>{'Installed Themes'|@translate}</h2>
 </div>
@@ -11,7 +18,7 @@
 {foreach from=$active_themes item=theme}
   <div class="themeBox{if $theme.is_default} themeDefault{/if}">
     <div class="themeName">{$theme.name}{if $theme.is_default} <em>({'default'|@translate})</em>{/if}</div>
-    <div class="themeShot"><img src="{$theme.screenshot}" alt=""></div>
+    <div class="themeShot"><a href="{$theme.screenshot}" class="preview-box" title="{$theme.name}"><img src="{$theme.screenshot}" alt=""></a></div>
     <div class="themeActions">
       <div>
 {if $theme.deactivable}
@@ -41,7 +48,7 @@
 {foreach from=$inactive_themes item=theme}
   <div class="themeBox">
     <div class="themeName">{$theme.name}</div>
-    <div class="themeShot"><img src="{$theme.screenshot}" alt=""></div>
+    <div class="themeShot"><a href="{$theme.screenshot}" class="preview-box" title="{$theme.name}"><img src="{$theme.screenshot}" alt=""></a></div>
     <div class="themeActions">
       <div>
   {if $theme.activable}
diff --git a/admin/themes/default/template/themes_new.tpl b/admin/themes/default/template/themes_new.tpl
index ff7e4c514..d897deabb 100644
--- a/admin/themes/default/template/themes_new.tpl
+++ b/admin/themes/default/template/themes_new.tpl
@@ -1,3 +1,9 @@
+{include file='include/colorbox.inc.tpl'} 
+{footer_script}{literal}
+jQuery(document).ready(function() {
+  $("a.preview-box").colorbox(); 
+}); 
+{/literal}{/footer_script}
 <div class="titrePage">
   <h2>{'Add New Theme'|@translate}</h2>
 </div>
@@ -7,7 +13,7 @@
 {foreach from=$new_themes item=theme name=themes_loop}
   <div class="themeBox">
     <div class="themeName">{$theme.name}</div>
-    <div class="themeShot"><img src="{$theme.screenshot}" onerror="this.src='{$default_screenshot}'"></div>
+    <div class="themeShot"><a href="{$theme.screenshot}" class="preview-box" title="{$theme.name}"><img src="{$theme.thumbnail}" onerror="this.src='{$default_screenshot}'"></a></div>
     <div class="themeActions"><a href="{$theme.install_url}">{'Install'|@translate}</a></div>
   </div>
 {/foreach}
diff --git a/admin/themes_new.php b/admin/themes_new.php
index 15b998b99..542d8a79f 100644
--- a/admin/themes_new.php
+++ b/admin/themes_new.php
@@ -127,7 +127,8 @@ if ($themes->get_server_themes(true)) // only new themes
       'new_themes',
       array(
         'name' => $theme['extension_name'],
-        'screenshot' => PEM_URL.'/upload/extension-'.$theme['extension_id'].'/thumbnail.jpg',
+        'thumbnail' => PEM_URL.'/upload/extension-'.$theme['extension_id'].'/thumbnail.jpg',
+        'screenshot' => PEM_URL.'/upload/extension-'.$theme['extension_id'].'/screenshot.jpg',
         'install_url' => $url_auto_install,
         )
       );