diff --git a/TODO.txt b/TODO.txt
new file mode 100644
index 0000000..e4cc026
--- /dev/null
+++ b/TODO.txt
@@ -0,0 +1,56 @@
+**- Averiguar qué pasa con la URL. Cuando navego a un post, no cambia la URL
+	No pasa nada. Es porque como no está configurado el htaccess, usa de url
+	test.domain.com/?p=123, y debe ser que algo acaba ocultado el querystring
+
+
+- Ajustar la página de histórico
+- Arreglar accesos directos a github y twitter
+- Dar formato a los títulos de los posts para que no se vean como los demás enlaces
+- Revisar los comentarios
+- Añadir un bloque "Quien soy" en el pie de cada post
+- Añadir botones para compartir en la parte de abajo del post
+- Dar formato a las entradas relacionadas
+- Añadir licencia
+
+Botón de twitter:
+
+<a href="https://twitter.com/share" class="twitter-share-button" data-via="gulnor">Tweet</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+
+Botón de FB:
+
+<!-- En teoría esto va justo tras abrir el body -->
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<!-- ...y esto donde quieras que salga. en el data-href va la url que quieres compartir -->
+<div class="fb-like" data-href="http://developers.facebook.com/docs/reference/plugins/like" data-send="false" data-layout="button_count" data-width="450" data-show-faces="true" data-action="recommend"></div>
+
+Botón de Google Plus:
+
+<!-- Place this tag where you want the +1 button to render. -->
+<div class="g-plusone" data-size="medium"></div>
+
+<!-- Place this tag after the last +1 button tag. -->
+<script type="text/javascript">
+  window.___gcfg = {lang: 'es'};
+
+  (function() {
+    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+    po.src = 'https://apis.google.com/js/plusone.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+  })();
+</script>
+
+Linked in:
+
+<script src="//platform.linkedin.com/in.js" type="text/javascript">
+ lang: es_ES
+</script>
+<script type="IN/Share" data-counter="right"></script>
\ No newline at end of file
diff --git a/content-single.php b/content-single.php
index 61914d3..ff6a2e7 100644
--- a/content-single.php
+++ b/content-single.php
@@ -4,6 +4,8 @@
  */
 ?>
 
+<?php /** Este template se usa cuando se muestran un único post */ ?>
+
 <?php if ( has_post_format( 'quote' ) ) : ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
@@ -33,12 +35,15 @@
 	<?php else : ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<div class="entry-title"><h2><?php the_title(); ?></h2>
-			<div class="social-reply <?php echo get_theme_mod( 'show_reply_option', 'hidden' ); ?>"><a href="https://twitter.com/intent/tweet?screen_name=<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>&text=(about%3A%20<?php the_permalink(); ?>) " class="twitterreply replylink left" target="_blank" data-related="<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>">With Twitter</a><div class="replytrigger">Reply</div><a href="https://alpha.app.net/intent/post?text=@<?php echo get_theme_mod( 'adn_reply_username', '' ); ?> (about%3A%20<?php the_permalink(); ?>) " class="adnreply replylink right" target="_blank">With ADN</a></div></div>
+		<div class="entry-title">
+			<h2><?php the_title(); ?></h2>
+		</div>
 	</header><!-- .entry-header -->
 
 		<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
+
+
 		<footer class="entry-meta">
 			<?php edit_post_link( __( 'Edit', 'decode' ), '<span class="edit-link">', '</span>' ); ?>
 			<p class="tags"><?php the_tags(); ?></p>
diff --git a/content.php b/content.php
index 4833900..3b7f907 100644
--- a/content.php
+++ b/content.php
@@ -4,35 +4,7 @@
  */
 ?>
 		
-	<?php if ( has_post_format( 'quote' ) ) : ?>
-	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-			<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
-		<footer class="entry-meta">
-			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
-		<span class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?></span>
-		<?php endif; ?>
-			<p class="date"><a href="<?php the_permalink(); ?>">Posted on <?php decode_posted_on(); ?></a></p>
-		</footer><!-- .entry-meta -->
-	</article><!-- #post-<?php the_ID(); ?> -->
-		
-	<?php elseif ( has_post_format( 'link' )): ?>
-				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-				<header class="entry-header">
-					<div class="entry-title"><h2><?php decode_print_post_title() ?></h2>
-					<div class="social-reply <?php echo get_theme_mod( 'show_reply_option', 'hidden' ); ?>"><a href="https://twitter.com/intent/tweet?screen_name=<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>&text=(about%3A%20<?php the_permalink(); ?>) " class="twitterreply replylink left" target="_blank" data-related="<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>">With Twitter</a><div class="replytrigger">Reply</div><a href="https://alpha.app.net/intent/post?text=@<?php echo get_theme_mod( 'adn_reply_username' ); ?> (about%3A%20<?php the_permalink(); ?>) " class="adnreply replylink right" target="_blank">With ADN</a></div></div>
-				</header>
-				
-					<div class="entry-content"><?php the_content( __( 'continue reading &raquo;', 'twentyten' ) ); ?></div>
-					<footer class="entry-meta">
-						<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
-		<span class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', '_s' ), __( '1 Comment', '_s' ), __( '% Comments', '_s' ) ); ?></span>
-		<?php endif; ?>
-						<p class="date"><a href="<?php the_permalink(); ?>">Posted on <?php decode_posted_on(); ?></a></p>
-					</footer><!-- .entry-meta -->
-				</article>
-	
-	<?php elseif ( is_search() ) : // Only display Excerpts for Search ?>
+	<?php if ( is_search() ) : // Only display Excerpts for Search ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
@@ -41,10 +13,14 @@
 		</div>
 	
 	<?php else : ?>
+
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<div class="entry-title"><h2><?php the_title(); ?></h2>
-			<div class="social-reply <?php echo get_theme_mod( 'show_reply_option', 'hidden' ); ?>"><a href="https://twitter.com/intent/tweet?screen_name=<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>&text=(about%3A%20<?php the_permalink(); ?>) " class="twitterreply replylink left" target="_blank" data-related="<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>">With Twitter</a><div class="replytrigger">Reply</div><a href="https://alpha.app.net/intent/post?text=@<?php echo get_theme_mod( 'adn_reply_username', '' ); ?> (about%3A%20<?php the_permalink(); ?>) " class="adnreply replylink right" target="_blank">With ADN</a></div></div>
+		<div class="entry-title">
+			<a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>">
+				<h2><?php the_title(); ?></h2>
+			</a>
+		</div>
 	</header><!-- .entry-header -->
 
 		<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
diff --git a/functions.php b/functions.php
index 7e01a48..7ab6c85 100644
--- a/functions.php
+++ b/functions.php
@@ -48,18 +48,6 @@ function decode_setup() {
 		'primary' => __( 'Primary Menu', 'decode' ),
 	) );
 
-	/**
-	 * Enable support for Post Formats
-	 */
-	add_theme_support( 'post-formats', array( 'aside', 'image', 'video', 'quote', 'link' ) );
-
-	/**
-	 * Setup the WordPress core custom background feature.
-	 */
-	add_theme_support( 'custom-background', apply_filters( 'decode_custom_background_args', array(
-		'default-color' => 'E3E5E7',
-		'default-image' => '',
-	) ) );
 }
 endif; // decode_setup
 add_action( 'after_setup_theme', 'decode_setup' );
diff --git a/header.php b/header.php
index fa3815f..6d445d2 100644
--- a/header.php
+++ b/header.php
@@ -25,7 +25,7 @@
 		<img id="sidebar_link" class="SidebarLink <?php echo get_theme_mod( 'sidebar_button_position', 'left' );?> <?php echo get_theme_mod( 'show_sidebar', 'hidden' );?>" src="<?php echo get_template_directory_uri(); ?>/images/menu.svg">
 		<div class="site-branding">
 			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
-			<h2 class="site-description"><?php echo get_theme_mod( 'use_html_in_description', '' ); ?></h2>
+			<h2 class="site-description"><?php bloginfo('description'); ?></h2>
 		</div>
 		<div class="sociallinks <?php echo get_theme_mod( 'show_social_icons', 'hidden' );?>">
 			<ul> 
diff --git a/inc/customizer.php b/inc/customizer.php
index 9df821e..5d5633b 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -281,15 +281,7 @@ function decode_customize_register( $wp_customize ) {
     $wp_customize->add_setting( 'show_theme_info', array(
 		'default'        => '',
 	) );
-	
-	$wp_customize->add_setting( 'html_description', array(
-		'default'        => '',
-	) );
-	
-    $wp_customize->add_setting( 'use_html_in_description', array(
-		'default'        => '',
-	) );
-	
+		
 	
 	$wp_customize->add_control( 'show_theme_info', array(
 		'label'   => 'Show Theme Info (display a line of text about the theme and its creator at the bottom of pages)',
@@ -302,24 +294,6 @@ function decode_customize_register( $wp_customize ) {
 		'priority'=> 1,
 	) );	
 	
-	$wp_customize->add_control( 'html_description', array(
-		'label'   => 'HTML for description (set this first, then save)',
-		'section' => 'decode_other_options',
-		'type'    => 'text',
-		'priority'=> 1,
-	) );
-
-	$wp_customize->add_control( 'use_html_in_description', array(
-		'label'   => 'After saving the above setting, set and save this one. Want HTML in the header\'s description?',
-		'section' => 'decode_other_options',
-		'type'       => 'radio',
-		'choices'    => array(
-			get_theme_mod( 'html_description' ) => 'Yes',
-			get_bloginfo ( 'description' ) => 'No',
-        ),
-		'priority'=> 2,
-	) );
-
 
 }
 add_action( 'customize_register', 'decode_customize_register' );
diff --git a/index.php b/index.php
index eb62d28..11184c4 100644
--- a/index.php
+++ b/index.php
@@ -13,6 +13,8 @@
 
 get_header(); ?>
 
+<?php /** Este template se usa sólo en la página principal, pero no en el resto de listas (tags, categorías, etc.) */ ?>
+
 		<div id="primary" class="content-area">
 			<div id="content" class="site-content" role="main">
 
diff --git a/style.css b/style.css
index 50e80f0..1057bea 100644
--- a/style.css
+++ b/style.css
@@ -49,7 +49,7 @@ html {
 	-ms-text-size-adjust: 100%; /* www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ */
 }
 body {
-	background: #fff;
+	background: #ffffff;
 }
 article,
 aside,
@@ -104,7 +104,7 @@ textarea {
 }
 
 body {
-	background: #E3E5E7;
+	background: #fcf9fa;
 	text-align: left;
 	margin: 0;
 	-webkit-overflow-scrolling: touch;
@@ -170,7 +170,7 @@ pre {
 	max-width: 100%;
 }
 code, kbd, tt, var {
-	font: 15px Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
+	font-family: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
 }
 abbr, acronym {
 	border-bottom: 1px dotted #666;
@@ -313,7 +313,7 @@ textarea {
 
 /* Links */
 a {
-	color: #009BCD;
+	color: #FF9625;
 	text-decoration: none;
 }
 
@@ -375,7 +375,11 @@ object {
 .site-header {
 	width: 100%;
 	margin: 5% auto 0;
-	border-bottom: 1px solid #009BCD;
+	border-bottom: 1px solid #E7D6B0;
+}
+
+.site-branding {
+	margin-bottom: 2em;
 }
 
 .site-title {
@@ -401,12 +405,13 @@ object {
 	text-align: center;
 	font-size: 1.35em;
 	padding: 1%;
-	border-bottom: 1px solid #009BCD;
+	border-bottom: 1px solid #FF9625;
 	display: inline-block;
 }
 
 .site-description {
 	text-align: center;
+	font-size: 1.3em;
 }
 
 .sociallinks {
@@ -454,6 +459,7 @@ object {
 	clear: both;
 	width: 100%;
 	text-align: center;
+	font-size: 0.9em;
 	margin-bottom: 1.5%;
 }
 .navigation-main ul {
@@ -472,13 +478,13 @@ object {
 	transition: color 0.25s ease-out;
 	display: block;
 	text-decoration: none;
-	color: #444444;
+	color: #555;
 }
 .navigation-main a:hover {
-	color: #009BCD;
+	color: #FF9625;
 }
 .navigation-main a:active {
-	color: #007EA6
+	color: #FF8525
 }
 .navigation-main ul ul {
 	box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2);
@@ -568,27 +574,36 @@ article.page {
 }
 
 
-.content h1 {
-	font-size: 2em;
+#content h1, 
+#content h2, 
+#content h3,
+#content h4,
+#content h5,
+#content h6 {
+	margin-bottom: 1.2em;
 }
 
-.content h2 {
-	font-size: 1.8em;
+#content h1 {
+	font-size: 2em;
 }
 
-.content h3 {
-	font-size: 1.6em;
+#content h2 {
+	font-size: 1.8em;
 }
 
-.content h4 {
+#content h3 {
 	font-size: 1.4em;
 }
 
-.content h5 {
+#content h4 {
 	font-size: 1.2em;
 }
 
-.content h6 {
+#content h5 {
+	font-size: 1.1em;
+}
+
+#content h6 {
 	font-size: 1.1em;
 }
 
@@ -619,14 +634,14 @@ article.page .entry-content {
 .post blockquote {
 	margin: 1.5% 0;
 	padding: 0 0 0 5%;
-	border-left: 1px solid #009BCD;
+	border-left: 1px solid #FF9625;
 	font-style: italic;
 }
 
 .post footer {
 	width: 75%;
 	margin: 0 auto;
-	border-bottom: 1px solid #009BCD;
+	border-bottom: 1px solid #E7D6B0;
 }
 
 .tags {
@@ -651,13 +666,13 @@ footer .date a {
 	color: #808080;
 }
 
-	footer .date a:hover {
-		color: #009BCD;
-	}
-	
-	footer .date a:active {
-		color: #007EA6;
-	}
+footer .date a:hover {
+	color: #FF9625;
+}
+
+footer .date a:active {
+	color: #FF8525;
+}
 
 .theme-info {
 	font-size: 0.8em;
@@ -697,7 +712,7 @@ footer .date a {
 	height: 3.5%;
 	padding: 4.5% 0;
 	margin-bottom: 4.5%;
-	border-bottom: 1px solid #009BCD;
+	border-bottom: 1px solid #FF9625;
 	z-index: 11;
 }
 
@@ -810,12 +825,12 @@ footer .date a {
 	display: inline-block;
 }
 	.social-reply .replylink:hover {
-		color: #009BCD;
+		color: #FF9625;
 		border-bottom: none;
 	}
 	
 	.social-reply .replylink:active {
-		color: #007EA6;
+		color: #FF8525;
 		border-bottom: none;
 	}
 	
@@ -830,12 +845,12 @@ footer .date a {
 }
 
 	.format-link .entry-title a:hover {
-		color: #009BCD;
+		color: #FF9625;
 		border-bottom: none;
 	}
 	
 	.format-link .entry-title a:active {
-		color: #007EA6;
+		color: #FF8525;
 		border-bottom: none;
 	}
 
@@ -999,7 +1014,7 @@ object {
 .comment, .comment-body {
 	margin: 2.5% 0;
 	padding-bottom: 2.5%;
-	border-bottom: 1px solid #C0C0C0;
+	border-bottom: 1px solid #E7D6B0;
 }
 
 .comment:last-child, .comment-body:last-child {
@@ -1026,11 +1041,11 @@ object {
 }
 
 	.comment-metadata a:hover {
-		color: #009BCD;
+		color: #FF9625;
 	}
 	
 	.comment-metadata a:active {
-		color: #007EA6;
+		color: #FF8525;
 	}
 	
 li.comment {
@@ -1095,27 +1110,27 @@ li.comment {
 ----------------------------------------------- */
 @media only screen and (min-width: 699px) {
 a {
-	-webkit-transition: color 0.4s ease-in-out, border-bottom 0.4s ease-in-out;
-	-moz-transition: color 0.4s ease-in-out, border-bottom 0.4s ease-in-out;
-	transition: color 0.4s ease-in-out, border-bottom 0.4s ease-in-out;
+	-webkit-transition: color 0.2s ease-in-out, border-bottom 0.2s ease-in-out;
+	-moz-transition: color 0.2s ease-in-out, border-bottom 0.2s ease-in-out;
+	transition: color 0.2s ease-in-out, border-bottom 0.2s ease-in-out;
 	border-bottom: 0 solid rgba(69,69,69,0);
 }
 
-	a:hover {
-		color: #009BCD;
-	}
-	
-	a:active {
-		color: #007EA6;
-	}
+a:hover {
+	color: #FFB925;
+}
 
-	.post a:hover {
-		border-bottom: 1px solid #009BCD;
-	}
-	
-	.post a:active {
-		border-bottom: 1px solid #007EA6;
-	}
+a:active {
+	color: #FF8525;
+}
+
+.post a:hover {
+	border-bottom: 1px solid #FFB925;
+}
+
+.post a:active {
+	border-bottom: 1px solid #FF8525;
+}
 
 .site-header, .post, article.page, .comments-area {
 	width: 80%;
@@ -1128,23 +1143,23 @@ a {
 	transition: text-shadow 0.5s, color 0.5s;
 }
 
-	.site-title a:hover {
-		color: #444444;
-		text-shadow: 0px 0px 6px rgba(75,75,75,0.75);
-	}
-	
-	.site-title a:active {
-		color: #444444;
-		text-shadow: 0px -2px 12px rgba(75,75,75,0.85);
-	}
+.site-title a:hover {
+	color: #444444;
+	text-shadow: 0px 0px 6px rgba(75,75,75,0.75);
+}
+
+.site-title a:active {
+	color: #444444;
+	text-shadow: 0px -2px 12px rgba(75,75,75,0.85);
+}
 	
 .site-description a:hover {
-	border-bottom: 1px solid #009BCD;
+	border-bottom: 1px solid #FF9625;
 }
 
 .site-description a:active {
-	color: #007EA6;
-	border-bottom: 1px solid #007EA6;
+	color: #FF8525;
+	border-bottom: 1px solid #FF8525;
 }
 	
 .sociallinks ul {
@@ -1169,13 +1184,13 @@ a {
 	margin: 0 0.5%;
 }
 
-	.sociallinks img:hover {
-		opacity: 0.75;
-	}
-	
-	.sociallinks img:active {
-		opacity: 0.5;
-	}
+.sociallinks img:hover {
+	opacity: 0.75;
+}
+
+.sociallinks img:active {
+	opacity: 0.5;
+}
 
 .main-navigation li {
 	margin: 0 1.5%;
@@ -1285,11 +1300,11 @@ a {
 }
 
 	.theme-info a:hover {
-		border-bottom: 1px solid #009BCD;
+		border-bottom: 1px solid #FF9625;
 	}
 	
 	.theme-info a:active {
-		border-bottom: 1px solid #007EA6;
+		border-bottom: 1px solid #FF8525;
 	}
 }