diff --git a/src/wp-content/plugins/gravityforms/languages/gravityforms-es_ES.mo b/src/wp-content/plugins/gravityforms/languages/gravityforms-es_ES.mo
index 0072e80d..1e7b99e9 100644
Binary files a/src/wp-content/plugins/gravityforms/languages/gravityforms-es_ES.mo and b/src/wp-content/plugins/gravityforms/languages/gravityforms-es_ES.mo differ
diff --git a/src/wp-content/plugins/gravityforms/languages/gravityforms-es_ES.po b/src/wp-content/plugins/gravityforms/languages/gravityforms-es_ES.po
index 77f19646..5ad4def0 100644
--- a/src/wp-content/plugins/gravityforms/languages/gravityforms-es_ES.po
+++ b/src/wp-content/plugins/gravityforms/languages/gravityforms-es_ES.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: GravityForms es_ES\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-03 18:59-0400\n"
-"PO-Revision-Date: 2011-10-10 18:12+0100\n"
+"PO-Revision-Date: 2011-10-10 21:17+0100\n"
 "Last-Translator: \n"
 "Language-Team: Carmary <christian.rojas@carmary.com>\n"
 "MIME-Version: 1.0\n"
@@ -2479,12 +2479,12 @@ msgstr ""
 #: C:\Users\acancado\Rocketgenius\Sites\wp3\wp-content\plugins\gravityforms\common.php:2252
 #: C:\Users\acancado\Rocketgenius\Sites\wp3\wp-content\plugins\gravityforms\form_display.php:372
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #
 #: C:\Users\acancado\Rocketgenius\Sites\wp3\wp-content\plugins\gravityforms\common.php:2252
 msgid "max characters"
-msgstr "Maximale Zeichenanzahl"
+msgstr "carácteres máximos"
 
 #: C:\Users\acancado\Rocketgenius\Sites\wp3\wp-content\plugins\gravityforms\common.php:2422
 #: C:\Users\acancado\Rocketgenius\Sites\wp3\wp-content\plugins\gravityforms\form_detail.php:1315
diff --git a/src/wp-content/themes/lqdvi/pasarela_tpv.php.php b/src/wp-content/themes/lqdvi/pasarela_tpv.php
similarity index 95%
rename from src/wp-content/themes/lqdvi/pasarela_tpv.php.php
rename to src/wp-content/themes/lqdvi/pasarela_tpv.php
index 6cdae893..03ea1b34 100644
--- a/src/wp-content/themes/lqdvi/pasarela_tpv.php.php
+++ b/src/wp-content/themes/lqdvi/pasarela_tpv.php
@@ -34,8 +34,8 @@ function llamar_pasarela_amigo($entry) {
     $datos['moneda'] = '978'; //euros
     $datos['transaction_type'] = '0';
     $datos['producto'] = 'Aportacion LQDVI';
-    $datos['URLOK'] = $datos['url_comercio'].'/quieres-ser-amigo/gracias-por-ser-nuestro-amigo/';
-    $datos['URLKO'] = $datos['url_comercio'].'/quieres-ser-amigo/se-ha-producido-un-error/';
+    $datos['URLOK'] = $datos['url_comercio'].'/web/quieres-ser-amigo/gracias-por-ser-nuestro-amigo/';
+    $datos['URLKO'] = $datos['url_comercio'].'/web/se-ha-producido-un-error/';
           
     // Convertir la cantidad
     $datos['cantidad'] = ereg_replace("[^0-9]", "", $entry[19]);
@@ -87,8 +87,8 @@ function llamar_pasarela_socio($entry) {
     $datos['terminal'] = '1';
     $datos['num_orden'] = date('ymdHis');
     $datos['moneda'] = '978'; //euros    
-    $datos['URLOK'] = $datos['url_comercio'].'/quieres-ser-amigo/gracias-por-ser-nuestro-socio/';
-    $datos['URLKO'] = $datos['url_comercio'].'/quieres-ser-amigo/se-ha-producido-un-error/';
+    $datos['URLOK'] = $datos['url_comercio'].'/web/quieres-ser-amigo/gracias-por-ser-nuestro-socio/';
+    $datos['URLKO'] = $datos['url_comercio'].'/web/se-ha-producido-un-error/';
           
     // Convertir la cantidad
     $cuota = explode("|", $entry[9]);  //<- formato: frecuencia_ano|cantidad_euros
diff --git a/src/wp-content/themes/lqdvi/template-colaboradores.php b/src/wp-content/themes/lqdvi/template-colaboradores.php
index dbae4742..46380f9a 100644
--- a/src/wp-content/themes/lqdvi/template-colaboradores.php
+++ b/src/wp-content/themes/lqdvi/template-colaboradores.php
@@ -1,241 +1,282 @@
 <?php
 /* Template Name: Colaboradores */
 
-function cleanSource($src) {
-    return str_replace('http://localhost/lqdvi', '', $src);
+function cleanSource ($src) {
+	return str_replace ('http://localhost/lqdvi', '', $src);
 }
 
-if (!isset($hide_header) OR !$hide_header) {
-    get_header();
-}
-
-$pp_webcam_url = get_option('pp_webcam_url');
-
-$pp_capturas_style = get_option('pp_capturas_style');
-
-if (empty($pp_capturas_style)) {
-    $pp_capturas_style = '1';
-}
-
-$pp_capturas_img_width = get_option('pp_capturas_img_width');
-if (empty($pp_capturas_img_width)) {
-    $pp_capturas_img_width = 240;
-}
-
-$pp_capturas_img_height = get_option('pp_capturas_img_height');
-if (empty($pp_capturas_img_height)) {
-    $pp_capturas_img_height = 240;
-}
-
-
-
-if (!isset($hide_header) OR !$hide_header) {
-    get_header();
-}
-
-$caption_class = "page_caption";
-$portfolio_sets_query = '';
 
 /**
- * 	Get Current page object
- * */
+*	Get Current page object
+**/
 $page = get_page($post->ID);
 
 /**
- * 	Get current page id
- * */
-if (!isset($current_page_id) && isset($page->ID)) {
+*	Get current page id
+**/
+
+if(!isset($current_page_id) && isset($page->ID))
+{
     $current_page_id = $page->ID;
 }
 
+if(!isset($hide_header) OR !$hide_header)
+{
+	get_header(); 
+}
+
+$page_style = get_post_meta($current_page_id, 'page_style', true);
+$page_sidebar = get_post_meta($current_page_id, 'page_sidebar', true);
 $caption_style = get_post_meta($current_page_id, 'caption_style', true);
+$id_category = get_post_meta($current_page_id, 'id_category', true);
 
-if (empty($caption_style)) {
-    $caption_style = 'Title & Description';
+if(empty($caption_style))
+{
+	$caption_style = 'Title & Description';
 }
 
-if (!isset($hide_header) OR !$hide_header) {
-    ?>				
-    <div class="<?php echo $caption_class ?> capturas">
-        <div class="caption_inner">
-    <?php
-    $page_desc = get_post_meta($current_page_id, 'page_desc', true);
+if(!isset($sidebar_home))
+{
+	$sidebar_home = '';
+}
 
-    switch ($caption_style) {
-        case 'Description Only':
+if(empty($page_sidebar))
+{
+	$page_sidebar = 'Blog Sidebar';
+}
+$caption_class = "page_caption";
 
-            if (!empty($page_desc)) {
-                ?>
+if(!isset($add_sidebar))
+{
+	$add_sidebar = FALSE;
+}
 
-                        <div class="caption_header">
-                            <h2 class="cufon"><?php echo $page_desc; ?></h2>
-                        </div>
-                        <?php
-                    }
-                    break;
+$sidebar_class = '';
 
-                case 'Title Only':
-                    ?>
-                    <div class="caption_header">
-                        <h1 class="cufon"><?php _(the_title()); ?></h1>
-                    </div>
-            <?php
-            break;
+if($page_style == 'Right Sidebar')
+{
+	$add_sidebar = TRUE;
+	$page_class = 'sidebar_content';
+}
+elseif($page_style == 'Left Sidebar')
+{
+	$add_sidebar = TRUE;
+	$page_class = 'sidebar_content';
+	$sidebar_class = 'left_sidebar';
+}
+else
+{
+	$page_class = 'inner_wrapper';
+}
 
-        case 'Title & Description':
-            ?>
-                    <div class="caption_header">
-                        <h1 class="cufon"><?php _(the_title()); ?></h1>
-                    </div>
-                    <div class="caption_desc">
-                        <a href="<?php echo $pp_webcam_url; ?>"><?php _e($page_desc); ?></a>
-                    </div>
-                    <?php
-                    break;
-            }
-            ?>
+$pp_title = get_option('pp_blog_title');
 
-            <br class="clear"/>
+if(empty($pp_title))
+{
+	$pp_title = 'Blog';
+}
 
-        </div>
-    </div>
+if(!isset($hide_header) OR !$hide_header)
+{
+?>		
 
-    <!-- Begin content -->
-    <div id="content_wrapper" class="content_bg">
+		<div class="<?php echo $caption_class?>">
+				<div class="caption_inner">
+					<?php
+						$page_desc = get_post_meta($current_page_id, 'page_desc', true);
+						
+						switch($caption_style)
+						{
+							case 'Description Only':
+						
+							if(!empty($page_desc))
+							{
+					?>
+					
+						<div class="caption_header">
+							<h2 class="cufon"><?php echo $page_desc; ?></h2>
+						</div>
+					<?php
+							}
+							break;
+							
+							case 'Title Only':
+					?>
+						<div class="caption_header">
+							<h1 class="cufon"><?php echo the_title(); /*$pp_title;*/ ?></h1>
+						</div>
+					<?php
+							break;
+							
+							case 'Title & Description':
+					?>
+						<div class="caption_header">
+							<h1 class="cufon"><?php echo the_title(); /*$pp_title;*/ ?></h1>
+						</div>
+						<div class="caption_desc">
+							<?php _e($page_desc); ?>
+						</div>
+					<?php
+							break;
+						}
+					?>
+					<br class="clear"/>
+				</div>
+			</div>
 
-        <div class="inner">
 
-            <!-- Begin main content -->
-            <div class="inner_wrapper capturas"><br class="clear"/>
 
-    <?php
+		<!-- Begin content -->
+		<div id="content_wrapper" class="content_bg">
+			
+			<div class="inner">
+
+				<!-- Begin main content -->
+				<div class="inner_wrapper"><br class="clear"/>
+				
+<?php
+}
+?>
+
+					<?php 
+						if($add_sidebar && $page_style == 'Left Sidebar')
+						{
+					?>
+						<div class="sidebar_wrapper <?php echo $sidebar_class; ?>">
+						
+							<div class="sidebar <?php echo $sidebar_class; ?> <?php echo $sidebar_home; ?>">
+							
+								<div class="content">
+							
+									<ul class="sidebar_widget">
+									<?php dynamic_sidebar($page_sidebar); ?>
+									</ul>
+								
+								</div>
+						
+							</div>
+							<br class="clear"/>
+					
+							<div class="sidebar_bottom <?php echo $sidebar_class; ?>"></div>
+						</div>
+					<?php
+						}
+					?>
+				
+					<div class="sidebar_content">
+					
+<?php
+
+global $more; $more = false; # some wordpress wtf logic
+
+$query_string ="post_type=post&showposts=60&paged=$paged";
+$id_category = 5;
+
+if(empty($id_category)) {
+    $cat_id = get_cat_ID(single_cat_title('', false));
 } else {
-    echo '<br class="clear"/>';
+    $cat_id = $id_category;
 }
-?>	
 
-            <!-- Begin portfolio content -->
+if(!empty($cat_id))
+{
+	$query_string.= '&cat='.$cat_id;
+}
+
+query_posts($query_string);
+
+if (have_posts()) : while (have_posts()) : the_post();
+
+	$image_thumb = '';
+								
+	if(has_post_thumbnail(get_the_ID(), 'large'))
+	{
+	    $image_id = get_post_thumbnail_id(get_the_ID());
+	    $image_thumb = wp_get_attachment_image_src($image_id, 'large', true);
+	    $pp_blog_image_width = 150;
+	    $pp_blog_image_height = 150;
+	}
+?>
+						
+						
+						<!-- Begin each blog post -->
+							<?php
+								if(!empty($image_thumb))
+								{
+							?>
+							
+							<div class="post_img img_shadow_536" style="margin-top: 10px!important; float: left; width:<?php echo $pp_blog_image_width+10; ?>px;height:<?php echo $pp_blog_image_height+30; ?>px">
+								<a href="<?php the_permalink(); ?>" title="<?php the_title(); ?>">
+									<img src="<?php echo get_bloginfo( 'stylesheet_directory' ); ?>/timthumb.php?src=<?php echo cleanSource($image_thumb[0]); ?>&amp;h=<?php echo $pp_blog_image_height; ?>&amp;w=<?php echo $pp_blog_image_width; ?>&amp;zc=1" alt="" class="frame"/>
+								</a>
+							</div>
+							
+							<?php
+								}
+							?>
+							
+						<!-- End each blog post -->
+						
+
+
+
+<?php endwhile; endif; ?>
+                                                <br class="clear"/>
+						<div class="pagination"><p><?php posts_nav_link(' '); ?></p></div>
+						
+					</div>
+					
+					<?php
+						if($add_sidebar && $page_style == 'Right Sidebar')
+						{
+					?>
+						<div class="sidebar_wrapper <?php echo $sidebar_class; ?>">
+						
+							<div class="sidebar_top <?php echo $sidebar_class; ?>"></div>
+						
+							<div class="sidebar <?php echo $sidebar_class; ?> <?php echo $sidebar_home; ?>">
+							
+								<div class="content">
+							
+									<ul class="sidebar_widget">
+									<?php dynamic_sidebar($page_sidebar); ?>
+									</ul>
+								
+								</div>
+						
+							</div>
+							<br class="clear"/>
+					
+							<div class="sidebar_bottom <?php echo $sidebar_class; ?>"></div>
+						</div>
+					<?php
+						}
+					?>
+					
+				</div>
+				<!-- End main content -->
+				
+				<br class="clear"/>
+				
+			</div>
+			
+<?php
+if(!isset($hide_header) OR !$hide_header)
+{
+?>
+			
+		</div>
+		<!-- End content -->
+
+
+
+
+
+
+
+
+<?php get_footer(); ?>
 
 <?php
-$menu_sets_query = '';
-
-$captura_items = get_option('pp_capturas_items');
-if (empty($captura_items)) {
-    $captura_items = 12;
 }
-
-$captura_sort = get_option('pp_capturas_sort');
-if (empty($captura_sort)) {
-    $captura_sort = 'DESC';
-}
-
-//prepare data for pagination
-$offset_query = '';
-if (!isset($_GET['page']) OR empty($_GET['page']) OR $_GET['page'] == 1) {
-    $current_page = 1;
-} else {
-    $current_page = $_GET['page'];
-    $offset = (($current_page - 1) * $captura_items);
-}
-
-$args = array(
-    'numberposts' => $captura_items,
-    'order' => $captura_sort,
-    'orderby' => 'date',
-    'post_type' => array('capturas'),
-    'offset' => $offset,
-);
-
-$page_photo_arr = get_posts($args);
-
-
-//Get all portfolio items for paging
-
-$args = array(
-    'numberposts' => -1,
-    'order' => $captura_sort,
-    'orderby' => 'date',
-    'post_type' => array('capturas'),
-);
-
-$all_photo_arr = get_posts($args);
-$total = count($all_photo_arr);
-
-if (isset($page_photo_arr) && !empty($page_photo_arr)) {
-    ?>
-
-                <?php
-                foreach ($page_photo_arr as $key => $captura_item) {
-
-                    $image_url = '';
-
-                    if (has_post_thumbnail($captura_item->ID, 'large')) {
-                        $image_id = get_post_thumbnail_id($captura_item->ID);
-                        $image_url = wp_get_attachment_image_src($image_id, 'large', true);
-                        //$image_url[0] = cleanSource($image_url[0]);
-
-                        $small_image_url = get_bloginfo('stylesheet_directory') . '/timthumb.php?src=' . cleanSource($image_url[0]) . '&amp;h=' . $pp_capturas_img_height . '&amp;w=' . $pp_capturas_img_width . '&amp;zc=1';
-
-                        $permalink_url = get_permalink($captura_item->ID);
-                        
-                        $titulo = _($captura_item->post_title);
-                        $texto = pp_substr(strip_tags(strip_shortcodes($captura_item->post_content)), 50);                                                
-                        
-                        if ($texto != "") {
-                            $texto =  "&#013;" . $texto;
-                        }
-                        
-
-                        $last_class = '';
-                        $line_break = '';
-                        if (($key + 1) % $captura_items == 0) {
-                            $last_class = ' last';
-
-                            if (isset($page_photo_arr[$key + 1])) {
-                                $line_break = '<br class="clear"/><br/><br/><br/>';
-                            } else {
-                                $line_break = '<br class="clear"/>';
-                            }
-                        }
-                        ?>
-                        <div class="<?php echo $last_class ?> captura" style="height: <?php echo $pp_capturas_img_height;?>px; width: <?php echo $pp_capturas_img_width;?>px;">
-                            <img src="<?php echo $small_image_url; ?>" title="<?php echo $titulo.$texto; ?>" class="fade"/>
-                        </div>
-                        <?php
-                    }
-                    ?>
-
-                    <?php
-                    echo $line_break;
-                }
-                //End foreach loop
-                ?>
-
-                <?php
-                $base_link = get_permalink($post->ID);
-
-                echo gen_pagination($total, $current_page, $base_link, TRUE, $captura_items);
-            }
-            //End if have portfolio items
-            ?>
-
-
-        </div>
-        <!-- End main content -->
-
-        <br class="clear"/><br/><br/>
-
-    </div>
-
-            <?php
-            if (!isset($hide_header) OR !$hide_header) {
-                ?>				
-
-    </div>
-    <!-- End content -->
-
-
-                <?php get_footer(); ?>
-                <?php
-            }
-            ?>
\ No newline at end of file
+?>