diff --git a/templates/bulletproof/entries_archives.tpl b/templates/bulletproof/entries_archives.tpl
index 2eae4ca0..f3bf6520 100644
--- a/templates/bulletproof/entries_archives.tpl
+++ b/templates/bulletproof/entries_archives.tpl
@@ -1,23 +1,25 @@
 {serendipity_hookPlugin hook="entries_header"}
 <div class="serendipity_Entry_Date">
-   <h3 class="serendipity_date">{$CONST.ARCHIVES}</h3>
-   {foreach from=$archives item="archive"}
-      <h4 class="archives_header">{$archive.year}</h4>
-      {foreach from=$archive.months item="month"}
-      <ul class="archives_row">
-         {if $template_option.colorset == 'blank'}
-             <li class="archives_graph"><img src="{serendipity_getFile file="img/graph_bar_horisontal.png"}" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>
-         {else}
-             <li class="archives_graph"><img src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_graph_bar.png" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>
-         {/if}
-         <li class="archives_date">{$month.date|@formatTime:"%B"}</li>
-         <li class="archives_count">{$month.entry_count} {$CONST.ENTRIES}</li>
-         <li class="archives_count_link">({if $month.entry_count}<a href="{$month.link}">{/if}{$CONST.VIEW_FULL}{if $month.entry_count}</a>{/if})</li>
-         <li class="archives_link">({if $month.entry_count}<a href="{$month.link_summary}">{/if}{$CONST.VIEW_TOPICS}{if $month.entry_count}</a>{/if})</li>
-      </ul>
-      {/foreach}
-   {/foreach}
+    <h3 class="serendipity_date">{$CONST.ARCHIVES}</h3>
+    {foreach from=$archives item="archive"}
+        <div class="serendipity_entry archives_all_entry">
+            <h4 class="archives_header">{$archive.year}</h4>
+            {foreach from=$archive.months item="month"}
+                <ul class="archives_row {cycle values='archives_row_odd,archives_row_even'}">
+                    {if $template_option.colorset == 'blank'}
+                        <li class="archives_graph"><img src="{serendipity_getFile file="img/graph_bar_horisontal.png"}" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>
+                    {else}
+                        <li class="archives_graph"><img src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_graph_bar.png" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>
+                    {/if}
+                    <li class="archives_date">{$month.date|@formatTime:"%B"}</li>
+                    <li class="archives_count">{$month.entry_count} {$CONST.ENTRIES}</li>
+                    <li class="archives_count_link">({if $month.entry_count}<a href="{$month.link}">{/if}{$CONST.VIEW_FULL}{if $month.entry_count}</a>{/if})</li>
+                    <li class="archives_link">({if $month.entry_count}<a href="{$month.link_summary}">{/if}{$CONST.VIEW_TOPICS}{if $month.entry_count}</a>{/if})</li>
+                </ul>
+            {/foreach}
+        </div>
+    {/foreach}
 </div>
 <div class="serendipity_pageFooter" style="text-align: center">
-{serendipity_hookPlugin hook="entries_footer"}
+    {serendipity_hookPlugin hook="entries_footer"}
 </div>
diff --git a/templates/bulletproof/entries_summary.tpl b/templates/bulletproof/entries_summary.tpl
index 86e56404..01fd44c1 100644
--- a/templates/bulletproof/entries_summary.tpl
+++ b/templates/bulletproof/entries_summary.tpl
@@ -1,14 +1,26 @@
 {serendipity_hookPlugin hook="entries_header"}
 <div class="serendipity_Entry_Date">
-   <h3 class='serendipity_date'>{$CONST.TOPICS_OF} {$dateRange.0|@formatTime:"%B, %Y"}</h3>
-   <div class="serendipity_entry">
-   {foreach from=$entries item="entries"}
-      {foreach from=$entries.entries item="entry"}
-         <div class="archive_summary"><h4 class="archive_summary_title">{$entry.id} - <a href="{$entry.link}">{$entry.title|truncate:80:" ..."}</a></h4>
-         <span class="archive_summary_details">{$entry.timestamp|@formatTime:$template_option.date_format}. {$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {if $entry.categories} {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a> {/foreach}{/if}</span></div>
-      {/foreach}
-   {/foreach}
-   </div>
+    <h3 class='serendipity_date'>{$CONST.TOPICS_OF} {$dateRange.0|@formatTime:"%B, %Y"}</h3>
+    <div class="serendipity_entry archive_summary_entry">
+        {foreach from=$entries item="entries"}
+            {foreach from=$entries.entries item="entry"}
+                <dl class="archive_summary {cycle values='archive_summary_odd,archive_summary_even'}">
+                    <h4 class="archive_summary_title"><a href="{$entry.link}">{$entry.title|truncate:80:" ..."}</a></h4>
+                    <dt class="archive_summary_postdate">{$entry.timestamp|@formatTime:$template_option.date_format}</dt>
+                    <dd class="archive_summary_postdetails">
+                        {if $template_option.footerauthor == 'true'}
+                            {$CONST.POSTED_BY} <address class="author"><a href="{$entry.link_author}">{$entry.author}</a></address>
+                        {/if}
+                        {if $template_option.footercategories == 'true'}
+                            {if $entry.categories}
+                                {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
+                            {/if}
+                        {/if}
+                    </dd>
+                </dl>
+            {/foreach}
+        {/foreach}
+    </div>
 </div>
 
 <div class='serendipity_pageFooter' style="text-align: center">
diff --git a/templates/bulletproof/info.txt b/templates/bulletproof/info.txt
index 2d6044bb..8d47705b 100644
--- a/templates/bulletproof/info.txt
+++ b/templates/bulletproof/info.txt
@@ -1,4 +1,4 @@
 Name: Bulletproof v1.2 beta (s9y-bulletproof.com)
 Author: Bulletproof development team
-Date: 2007-11-15
+Date: 2007-11-18
 Require Serendipity: 1.2
diff --git a/templates/bulletproof/style.css b/templates/bulletproof/style.css
index edbf4a26..d3968ce5 100644
--- a/templates/bulletproof/style.css
+++ b/templates/bulletproof/style.css
@@ -122,7 +122,7 @@ abbr, acronym, .help{
 
 /*** Entry styles ***/
 .serendipity_Entry_Date {
-    padding: 0.5em 1em;
+    margin: 0.5em 1em;
 }
 
 .serendipity_entry {
@@ -164,6 +164,7 @@ ul.archives_row li {
     font-size: 80%;
 }
 
+.archive_summary_postdetails ,
 .archive_summary_title {
     margin: 0;
 }
@@ -172,6 +173,7 @@ ul.archives_row li {
     margin-bottom: 10px;
 }
 
+
 /*** s9y image manager ***/
 .serendipity_imageComment_center,
 .serendipity_imageComment_left,