diff --git a/template/yoga/admin/ws_checker.tpl b/template/yoga/admin/ws_checker.tpl
index 04177b1c6..55e1d0319 100644
--- a/template/yoga/admin/ws_checker.tpl
+++ b/template/yoga/admin/ws_checker.tpl
@@ -261,4 +261,7 @@
 
   </fieldset>
 </form>
+<object data="http://127.0.0.1/phpwebgallery/trunk/ws.php?&method=pwg.getVersion&partner=Public" type="text/html"
+style="width: 660px; height: 230px; position: relative; overflow: auto;">
+</object>
 <!-- END acc_list -->
diff --git a/template/yoga/mail/text/html/default-layout-mail-css.tpl b/template/yoga/mail/text/html/default-layout-mail-css.tpl
index cf506b7e0..170898ded 100644
--- a/template/yoga/mail/text/html/default-layout-mail-css.tpl
+++ b/template/yoga/mail/text/html/default-layout-mail-css.tpl
@@ -2,13 +2,13 @@
 /* Including like css style on HTML mail */
 
 body{background-color:#fff;font-family: Univers, Helvetica, Optima;font-size:12px; margin:0px;padding:0px; color:#369;}
-#the_page {background: #fff url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.jpg) repeat-y scroll left top;
+#the_page {background: #fff url(http://127.0.0.1/phpwebgallery/trunk/template/yoga/mail/text/html/images/mailbody-bg.jpg) repeat-y scroll left top;
 margin:0px;padding:0px;text-align: left;}
 a {text-decoration: none}
-#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.jpg) no-repeat scroll left top;
-margin:0px;padding:82px 0px 0px 62px;}
+#content {background: transparent url(http://127.0.0.1/phpwebgallery/trunk/template/yoga/mail/text/html/images/header-bg.jpg) no-repeat scroll left top;
+margin:0px;padding:82px 0px 0px 62px; width:732px;}
 hr {width:632px;margin-left:0px;}
-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.jpg) no-repeat scroll left bottom;
+#copyright {background: transparent url(http://127.0.0.1/phpwebgallery/trunk/template/yoga/mail/text/html/images/footer-bg.jpg) no-repeat scroll left bottom;
 color: #69c;font-size:10px;margin:0px;padding:98px 0px 62px 62px;}
 .PWG {font-family: verdana, sans-serif !important; font-size: 0.9em; font-weight: normal; letter-spacing: 0px;}
 a.PWG { border: 0px; }
diff --git a/template/yoga/theme/clear/layout-mail-css.tpl b/template/yoga/theme/clear/layout-mail-css.tpl
index 936c81426..dcf417be8 100644
--- a/template/yoga/theme/clear/layout-mail-css.tpl
+++ b/template/yoga/theme/clear/layout-mail-css.tpl
@@ -1,5 +1,8 @@
 /* $Id$ */
 /* Including like css style on HTML mail */
 
-body{background-color:#ffffff;}
-#the_page {background-color: #ffffff;}
+H2 { background-color: #ddd; padding: 7px 15px; width:617px}
+img { margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
+img:hover { padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
+A { color: #005e89; background: transparent; }
+A:hover { color: #858460; }
diff --git a/template/yoga/xml/default.tpl b/template/yoga/xml/default.tpl
deleted file mode 100644
index 618780c71..000000000
--- a/template/yoga/xml/default.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-
-<!-- Just a sample right now -->
-
-<group>
-  <title>PhpWebGallery - Web Service</title>
-  <text>default.tpl: To be customized.</text>
-
-  <!-- BEGIN row -->
-  <picture id="{row.ID}">
-    <caption>{row.CAPTION}</caption>
-    <date>{row.DATE}</date>
-    <text>{row.COMMENT}</text>
-    <!-- BEGIN High -->
-    <full-image width="{row.High.WIDTH}" height="{row.High.HEIGHT}">{row.High.URL}</full-image>
-    <!-- END High -->
-    <!-- BEGIN Normal -->
-    <image width="{row.Normal.WIDTH}" height="{row.Normal.HEIGHT}">{row.Normal.URL}</image>
-    <!-- END Normal -->
-    <!-- BEGIN Thumbnail -->
-    <small-image width="{row.Thumbnail.WIDTH}" height="{row.Thumbnail.HEIGHT}">{row.Thumbnail.URL}</small-image>
-    <!-- END Thumbnail -->
-  </picture>
-  <!-- END row -->
-<group>