diff --git a/theme/static/css/categories.css b/theme/static/css/categories.css
index a3146e3..8700e2a 100644
--- a/theme/static/css/categories.css
+++ b/theme/static/css/categories.css
@@ -1,7 +1,45 @@
-.hentry{ border-left: 10px solid; }
+h1 {
+    color: #000;
+}
 
-.content{ border-color: rgba(0, 0, 0, .2); }
-.dev{ border-color: rgba(150, 200, 150, .2); }
-.python{ border-color: rgba(0, 200, 0, .2); }
-.asso{ border-color: rgba(200, 0, 0, .2); }
-.thoughts{ border-color: rgba(100, 0, 100, .2); }
+#posts-list h1{
+    margin: 0;
+    padding: 0;
+}
+
+#posts-list a {
+    text-decoration: none;
+}
+
+.hentry {
+    border-left: 10px solid;
+    border-color: rgba(200, 200, 200, .2); 
+    color: rgba(200, 200, 200, .1); 
+    padding: 40px;
+}
+
+article .category {
+    position: absolute;
+    right: 0px;
+    font-size: 4em;
+    display: block;
+    font-style: italic;
+}
+
+#posts-list .hentry:hover{
+    margin-left: 2px;
+}
+
+.dev, .python {
+    border-color: rgba(150, 200, 150, .2); 
+    color: rgba(150, 200, 150, .1); 
+}
+.asso {
+    border-color: rgba(200, 0, 0, .2);
+    color: rgba(200, 0, 0, .1);
+}
+
+.thoughts {
+    border-color: rgba(100, 0, 100, .2); 
+    color: rgba(100, 0, 100, .1); 
+}
diff --git a/theme/static/css/main.css b/theme/static/css/main.css
index 64687cd..86f457e 100644
--- a/theme/static/css/main.css
+++ b/theme/static/css/main.css
@@ -53,23 +53,20 @@ a {outline: 0;}
 a img {border: 0px; text-decoration: none;}
 a:link, a:visited {
 	color: #C74350;
-	padding: 0 1px;
-	text-decoration: underline;
 }
-a:hover, a:active {
-	background-color: #C74350;
+
+.entry-content a:hover, .entry-content a:active {
 	color: #000;
-	text-decoration: none;
-	text-shadow: 1px 1px 1px #333;
 }
 
+h1 a:link, h1 a:visited { font-size: 1.2em; text-decoration: none; color: #000;, z-index: 10;}
+
 h1 a:hover {
     background-color: inherit
 }
 	
 /* Paragraphs */
 p {margin-bottom: 1.143em; text-align: justify}
-article .category { font-size: 3em; float: right; display: block; color: rgba(200, 200, 200, .2); }
 
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
@@ -367,7 +364,7 @@ li:last-child .hentry, #content > .hentry {margin: 0;}
 
 	/* Blog Index */
 	#posts-list {list-style: none; margin: 0;}
-	#posts-list .hentry {padding-left: 10px; position: relative;}
+	#posts-list .hentry {padding: 40px; position: relative;}
 	
 	#posts-list footer {
 		left: 10px;
diff --git a/theme/templates/article.html b/theme/templates/article.html
index 88a446b..49abe73 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -4,7 +4,7 @@
 <section id="content" class="body">    
 <article>
 <header>
-<h1 class="entry-title"><a href="{{ pagename }}" rel="bookmark" title="Permalink to {{ article.title }}"> {{ article.title }}</a></h1>
+<h1 class="entry-title">{{ article.title }}</h2>
         <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
         {% include 'twitter.html' %} </header>
         <div class="entry-content">
diff --git a/theme/templates/index.html b/theme/templates/index.html
index af1b0eb..2c7a0e2 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -5,12 +5,12 @@
     <section id="content" class="body">
     <ol id="posts-list" class="hfeed">
     {% for article in articles_page.object_list %}        
-        <li><article class="hentry {{ article.category }}">    
-        <span class='category'>{{ article.category }}</span>
-        <h1>
-            <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}"> {{ article.title }} </a>
-        </h1>
-        </article></li>
+        <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="{{ article.title}}">
+            <li><article class="hentry {{ article.category }}">    
+            <span class='category {{ article.category }}'>{{ article.category }}</span>
+            <h1> {{ article.title }} </h1>
+            </article></li>
+        </a>
     {% endfor %}
     </ol><!-- /#posts-list -->
     </section><!-- /#content -->