Index: bb-includes/class.bb-query.php
===================================================================
--- bb-includes/class.bb-query.php	(revision 2442)
+++ bb-includes/class.bb-query.php	(working copy)
@@ -934,34 +934,34 @@
 				$s_name = $s_id = 'search';
 			}
 			$r .= "\t<div><label for=\"$s_id\">" . __('Search term') . "</label>\n";
-			$r .= "\t\t<div><input name='$s_name' id='$s_id' type='text' class='text-input' value='$s_value' /></div>\n";
+			$r .= "\t\t<div><input name='$s_name' id='$s_id' type='text' class='text-input' value='$s_value'" . bb_get_tabindex() . " /></div>\n";
 			$r .= "\t</div>\n\n";
 		}
 
 		if ( $forum ) {
 			$r .= "\t<div><label for=\"forum-id\">" . __('Forum')  . "</label>\n";
-			$r .= "\t\t<div>" . bb_get_forum_dropdown( array( 'selected' => $q_forum_id, 'none' => __('Any') ) ) . "</div>\n";
+			$r .= "\t\t<div>" . bb_get_forum_dropdown( array( 'selected' => $q_forum_id, 'none' => __('Any'), 'tab' => true ) ) . "</div>\n";
 			$r .= "\t</div>\n\n";
 		}
 
 		if ( $tag ) {
 			$q_tag = esc_attr( $q_tag );
 			$r .= "\t<div><label for=\"topic-tag\">" .  __('Tag') . "</label>\n";
-			$r .= "\t\t<div><input name='tag' id='topic-tag' type='text' class='text-input' value='$q_tag' /></div>\n";
+			$r .= "\t\t<div><input name='tag' id='topic-tag' type='text' class='text-input' value='$q_tag'" . bb_get_tabindex() . " /></div>\n";
 			$r .= "\t</div>\n\n";
 		}
 
 		if ( $topic_author ) {
 			$q_topic_author = esc_attr( $q_topic_author );
 			$r .= "\t<div><label for=\"topic-author\">" . __('Topic author') . "</label>\n";
-			$r .= "\t\t<div><input name='topic_author' id='topic-author' type='text' class='text-input' value='$q_topic_author' /></div>\n";
+			$r .= "\t\t<div><input name='topic_author' id='topic-author' type='text' class='text-input' value='$q_topic_author'" . bb_get_tabindex() . " /></div>\n";
 			$r .= "\t</div>\n\n";
 		}
 
 		if ( $post_author ) {
 			$q_post_author = esc_attr( $q_post_author );
 			$r .= "\t<div><label for=\"post-author\">" . __('Post author') . "</label>\n";
-			$r .= "\t\t<div><input name='post_author' id='post-author' type='text' class='text-input' value='$q_post_author' /></div>\n";
+			$r .= "\t\t<div><input name='post_author' id='post-author' type='text' class='text-input' value='$q_post_author'" . bb_get_tabindex() . " /></div>\n";
 			$r .= "\t</div>\n\n";
 		}
 
@@ -969,7 +969,7 @@
 
 		if ( $topic_status ) {
 			$r .= "\t<div><label for=\"topic-status\">" . __('Topic status') . "</label>\n";
-			$r .= "\t\t<div><select name='topic_status' id='topic-status'>\n";
+			$r .= "\t\t<div><select name='topic_status' id='topic-status'" . bb_get_tabindex() . ">\n";
 			foreach ( $stati as $status => $label ) {
 				$selected = (string) $status == (string) $q_topic_status ? " selected='selected'" : '';
 				$r .= "\t\t\t<option value='$status'$selected>$label</option>\n";
@@ -980,7 +980,7 @@
 
 		if ( $post_status ) {
 			$r .= "\t<div><label for=\"post-status\">" . __('Post status') . "</label>\n";
-			$r .= "\t\t<div><select name='post_status' id='post-status'>\n";
+			$r .= "\t\t<div><select name='post_status' id='post-status'" . bb_get_tabindex() . ">\n";
 			foreach ( $stati as $status => $label ) {
 				$selected = (string) $status == (string) $q_post_status ? " selected='selected'" : '';
 				$r .= "\t\t\t<option value='$status'$selected>$label</option>\n";
@@ -991,13 +991,13 @@
 
 		if ( $poster_ip ) {
 			$r .= "\t<div><label for=\"poster-ip\">" . __('Poster IP address') . "</label>\n";
-			$r .= "\t\t<div><input name='poster_ip' id='poster-ip' type='text' class='text-input' value='$q_poster_ip' /></div>\n";
+			$r .= "\t\t<div><input name='poster_ip' id='poster-ip' type='text' class='text-input' value='$q_poster_ip'" . bb_get_tabindex() . " /></div>\n";
 			$r .= "\t</div>\n\n";
 		}
 
 		if ( $open ) {
 			$r .= "\t<div><label for=\"topic-open\">" . __('Open?') . "</label>\n";
-			$r .= "\t\t<div><select name='open' id='topic-open'>\n";
+			$r .= "\t\t<div><select name='open' id='topic-open'" . bb_get_tabindex() . ">\n";
 			foreach ( array( 'all' => __('All'), '1' => _x( 'Open', 'posting status' ), '0' => __('Closed') ) as $status => $label ) {
 				$label = esc_html( $label );
 				$selected = (string) $status == (string) $q_open ? " selected='selected'" : '';
@@ -1010,14 +1010,14 @@
 		if ( $topic_title ) {
 			$q_topic_title = esc_attr( $q_topic_title );
 			$r .= "\t<div><label for=\"topic-title\">" . __('Title') . "</label>\n";
-			$r .= "\t\t<div><input name='topic_title' id='topic-title' type='text' class='text-input' value='$q_topic_title' /></div>\n";
+			$r .= "\t\t<div><input name='topic_title' id='topic-title' type='text' class='text-input' value='$q_topic_title'" . bb_get_tabindex() . " /></div>\n";
 			$r .= "\t</div>\n\n";
 		}
 
 		$r .= apply_filters( 'bb_query_form_inputs', '', $args, $query_vars );
 
 		$r .= "\t<div class=\"submit\"><label for=\"$id-submit\">" . __('Search') . "</label>\n";
-		$r .= "\t\t<div><input type='submit' class='button submit-input' value='$submit' id='$id-submit' /></div>\n";
+		$r .= "\t\t<div><input type='submit' class='button submit-input' value='$submit' id='$id-submit'" . bb_get_tabindex() . " /></div>\n";
 		$r .= "\t</div>\n";
 
 		$r .= "\t</fieldset>\n\n";
Index: bb-includes/functions.bb-template.php
===================================================================
--- bb-includes/functions.bb-template.php	(revision 2442)
+++ bb-includes/functions.bb-template.php	(working copy)
@@ -5,7 +5,7 @@
 	global $bb, $bbdb, $bb_current_user, $page, $bb_cache,
 		$posts, $bb_post, $post_id, $topics, $topic, $topic_id,
 		$forums, $forum, $forum_id, $tags, $tag, $tag_name, $user, $user_id, $view,
-		$del_class, $bb_alt;
+		$del_class, $bb_alt, $bb_tabindex;
 
 	if ( $globals ) {
 		foreach ( $globals as $global => $v ) {
@@ -190,9 +190,8 @@
 	bb_load_template( 'footer.php' );
 }
 
-function bb_head()
-{
-	do_action('bb_head');
+function bb_head() {
+	do_action( 'bb_head' );
 }
 
 /**
@@ -349,6 +348,44 @@
 	return $class;
 }
 
+/**
+ * Echoes tabindex and also increments it
+ *
+ * @param mixed $args
+ * @since 1.1
+ */
+function bb_tabindex( $args = false ) {
+	echo bb_get_tabindex( $args );
+}
+
+/**
+ * Returns tabindex and also increments it
+ *
+ * @param mixed $args
+ * @since 1.1
+ */
+function bb_get_tabindex( $args = false ) {
+	$defaults = array(
+		'val'		=> false,	/* (false or int) If it is passed, then it will be echoed instead of $bb_tabindex and $bb_tabindex will also not be incremented */
+		'set_to_value'	=> false	/* (false or int) If an integer is passed, $bb_tabindex is set to it */
+	);
+	$args = wp_parse_args( $args, $defaults );
+	
+	global $bb_tabindex;
+	if ( !$bb_tabindex )
+		$bb_tabindex = '1';
+	
+	$ti = $args['val'] != false ? $args['val'] : $bb_tabindex;
+	$r = ' tabindex="' . $ti . '"';
+	
+	if ( $args['set_to_value'] != false )
+		$bb_tabindex = (int) $args['set_to_value'];
+	elseif ( !$args['val'] )
+		$bb_tabindex++;
+	
+	return $r;
+}
+
 function bb_location() {
 	echo apply_filters( 'bb_location', bb_get_location() );
 }
@@ -394,12 +431,12 @@
 		case 'search.php':
 			$location = 'search-page';
 			break;
+		case 'favorites.php':
+			$location = 'favorites-page';
+			break;
 		case 'profile.php':
 			$location = 'profile-page';
 			break;
-		case 'favorites.php':
-			$location = 'favorites-page';
-			break;
 		case 'view.php':
 			$location = 'view-page';
 			break;
@@ -544,14 +581,135 @@
 	return apply_filters( 'bb_get_title', implode( $args['separator'], $title ), $args, $title );
 }
 
+/**
+ * Generate Bread Crumbs
+ *
+ * @since 1.1
+ * @param mixed $args
+ */
+function bb_auto_crumbs( $args = '' ) {
+	echo apply_filters( 'bb_auto_crumbs', bb_get_auto_crumbs( $args ), $args );
+}
+
+/**
+ * Generate Bread Crumbs
+ *
+ * @since 1.1
+ * @param mixed $args
+ */
+function bb_get_auto_crumbs( $args ) {
+	$defaults = array(
+		'class'		=> 'bbcrumb',	/* Class for <div>, can be false */
+		'id'		=> false,	/* ID for <div>, can be false */
+		'span_current'	=> false,	/* The class for current page, can be false if you do not want any class (not for forum) */
+		'current'	=> false,	/* Override the 'current' text (not for forum) */
+		'force'		=> false,	/* Some pages like 404 have to force a to generate crumbs, this might also be used by plugins */
+		'separator'	=> ' &raquo; '
+	);
+	$args = wp_parse_args( $args, $defaults );
+	
+	$r		= '';
+	$crumbs		= array( bb_get_uri() => bb_get_option( 'name' )  );
+	$location	= !$args['force'] ? bb_get_location() : $args['force'];
+	$class		= $args['class'] ? ' class="' . $args['class'] . '"' : '';
+	$id		= $args['id'] ? ' id="' . $args['id'] . '"' : '';
+	
+	switch ( $location ) {
+		case 'front-page': /* For new topic */
+			global $forums;
+			if ( !$forums && isset( $_GET['new'] ) && '1' == $_GET['new'] )
+				$crumbs['current'] = __( 'Add New Topic' );
+			break;
+		case 'login-page':
+			$crumbs['current'] = __( 'Log in' );
+			break;
+		case 'profile-base': /* Is forced */
+			global $user_id, $profile_page_title;
+			$crumbs[get_user_profile_link( $user_id )] = get_user_display_name( $user_id );
+			$crumbs['current'] = $profile_page_title;
+			break;
+		case 'profile-page': /* Also for favorites and profile edit */
+			global $user_id;
+			$crumbs[get_user_profile_link( $user_id )] = get_user_display_name( $user_id );
+			if ( $tab = isset( $_GET['tab'] ) ? $_GET['tab'] : bb_get_path( 2 ) ) {
+				if ( $tab == 'favorites' )
+					$crumbs['current'] = __( 'Favorites' );
+				elseif ( $tab == 'edit' )
+					$crumbs['current'] = __( 'Edit Profile' );
+			} else {
+				$crumbs['current'] = __( 'Profile' );
+			}
+			break;
+		case 'register-page':
+			$crumbs['current'] = __( 'Register' );
+			break;
+		case 'search-page':
+			$crumbs['current'] = __( 'Search' );
+			break;
+		case 'stats-page':
+			$crumbs['current'] = __( 'Statistics' );
+			break;
+		case 'tag-page':
+			$crumbs[bb_get_tag_page_link()] = __( 'Tags' );
+			if ( bb_is_tag() )
+				$crumbs['current'] = bb_get_tag_name();
+			break;
+		case 'view-page':
+			$crumbs['current'] = get_view_name();
+			break;
+		case 'topic-page':
+			$crumbs['direct_return'] = bb_get_forum_bread_crumb( array( 'separator' => $args['separator'] ) );
+			$crumbs['current'] = $args['separator'] . get_topic_title();
+			break;
+		case 'forum-page':
+			$crumbs['direct_return'] = bb_get_forum_bread_crumb( array( 'separator' => $args['separator'] ) );
+			break;
+		case 'topic-edit-page':
+			$crumbs['current'] = __( 'Edit Post' );
+			break;
+		case '404': /* Is forced */
+			$crumbs['current'] = __( 'Page not found!' );
+			break;
+		default:
+			$crumbs = apply_filters( 'bb_get_auto_crumbs_location', $crumbs, $location, $args );
+			break;
+	}
+	
+	if ( count( $crumbs ) > 1 ) {
+		$r .= '<div ' . $class . $id . '">';
+		foreach ( $crumbs as $url => $text ) {
+			switch ( $url ) {
+				case 'direct_return': /* No &raquo, span or link, direct return */
+					$r .= $text;
+					break;
+				case 'current': /* Checks if there is text for current, if not uses the one given in above switch. Also checks if span_current class is given or not */
+					if ( !empty( $args['current'] ) )
+						$text = $args['current'];
+					$r .= ( !$args['span_current'] ) ? $text : '<span class="' . $args['current'] . '">' . $text . '</span>';
+					break;
+				case null: /* If no url, then just return with a &raquo; */
+					$r .= $text . ' &raquo; ';
+					break;
+				default:
+					$sep = in_array( $location, array( 'forum-page', 'topic-page' ) ) ? '' : $args['separator']; /* Separator is added in bb_get_form_bread_crumb too */
+					$r .= '<a href="' . $url . '">' . $text . '</a>' . $sep;
+					break;
+			}
+		}
+		$r .= '</div>';
+	}
+	
+	return apply_filters( 'bb_get_auto_crumbs', $r, $args );
+}
+
 function bb_feed_head() {
 	
 	$feeds = array();
 	
-	switch (bb_get_location()) {
+	switch ( bb_get_location() ) {
 		case 'profile-page':
-			if ( $tab = isset($_GET['tab']) ? $_GET['tab'] : bb_get_path(2) )
-				if ($tab != 'favorites')
+			if ( $tab = isset( $_GET['tab'] ) ? $_GET['tab'] : bb_get_path( 2 ) )
+				if ( $tab != 'favorites' )
 					break;
 			
 			$feeds[] = array(
@@ -1578,7 +1736,7 @@
  * @return string The link to the new topic form
  */
 function bb_get_new_topic_link( $args = null ) {
-	$defaults = array( 'text' => __('Add New &raquo;'), 'forum' => 0, 'tag' => '' );
+	$defaults = array( 'text' => __( 'Add New &raquo;' ), 'forum' => 0, 'tag' => '', 'before' => '', 'after' => '' );
 	if ( $args && is_string($args) && false === strpos($args, '=') )
 		$args = array( 'text' => $args );
 
@@ -1611,7 +1769,7 @@
 	}
 
 	if ( $url = esc_attr( apply_filters( 'new_topic_url', $url, $args ) ) )
-		return '<a href="' . $url . '" class="new-topic">' . $text . '</a>' . "\n";
+		return $before . '<a href="' . $url . '" class="new-topic">' . $text . '</a>' . $after . "\n";
 }
 
 function bb_new_topic_link( $args = null ) {
@@ -1646,7 +1804,7 @@
 	global $page, $search_count, $per_page;
 	
 	$defaults = array( 'before' => '', 'after' => '' );
- 	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args( $args, $defaults );
 	
 	if ( $pages = apply_filters( 'bb_search_pages', get_page_number_links( array( 'page' => $page, 'total' => $search_count, 'per_page' => $per_page, 'mod_rewrite' => false ) ) ) )
 		echo $args['before'] . $pages . $args['after'];
@@ -2266,7 +2424,7 @@
 }
 
 function get_user_delete_button() {
-	$r  = '<input type="submit" class="delete" name="delete-user" value="' . __('Delete User &raquo;') . '" ';
+	$r  = '<input type="submit" class="delete" name="delete-user" value="' . __( 'Delete User &raquo;' ) . '"' . bb_get_tabindex() . ' ';
 	$r .= 'onclick="return confirm(\'' . esc_js(__('Are you sure you want to delete this user?')) . '\')" />';
 	return apply_filters( 'get_user_delete_button', $r);
 }
@@ -2506,7 +2664,7 @@
 <?php
 			if ($key == 'display_name') {
 ?>
-		<select name="display_name" id="display_name">
+		<select name="display_name" id="display_name"<?php bb_tabindex(); ?>>
 <?php
 				$public_display = array();
 				$public_display['display_displayname'] = $user->display_name;
@@ -2535,7 +2693,7 @@
 			} else {
 ?>
 		<?php if ( 'checkbox' == $type && isset($label[5]) ) echo '<label for="' . $name . '">'; ?>
-		<input name="<?php echo $name; ?>" id="<?php echo $name; ?>" type="<?php echo $type; ?>"<?php echo $checked; ?> value="<?php echo $value; ?>" />
+		<input name="<?php echo $name; ?>" id="<?php echo $name; ?>" type="<?php echo $type; ?>"<?php echo $checked; ?> value="<?php echo $value; ?>"<?php bb_tabindex(); ?> />
 		<?php if ( 'checkbox' == $type && isset($label[5]) ) echo esc_html( $label[5] ) . '</label>'; ?>
 <?php
 			}
@@ -2586,11 +2744,11 @@
 <table id="admininfo">
 <tr class='form-field<?php if ( in_array( 'role', $error_codes ) ) echo ' form-invalid error'; ?>'>
 	<th scope="row">
-		<label for="admininfo_role"><?php _e('User Type'); ?></label>
+		<label for="admininfo_role"><?php _e( 'User Type' ); ?></label>
 		<?php if ( in_array( 'role', $error_codes ) ) echo '<em>' . $errors->get_error_message( 'role' ) . '</em>'; ?>
 	</th>
 	<td>
-		<select id="admininfo_role" name="role">
+		<select id="admininfo_role" name="role"<?php bb_tabindex(); ?>>
 <?php
 	foreach( $roles as $r => $n ) {
 		if ( isset( $user->capabilities ) && is_array( $user->capabilities ) && array_key_exists( $r, $user->capabilities ) ) {
@@ -2611,7 +2769,7 @@
 	if (count($assignable_caps)) :
 ?>
 <tr class="extra-caps-row">
-	<th scope="row"><?php _e('Allow this user to'); ?></th>
+	<th scope="row"><?php _e( 'Allow this user to' ); ?></th>
 	<td>
 <?php
 	foreach( $assignable_caps as $cap => $label ) :
@@ -2623,7 +2781,7 @@
 		$label = esc_html( $label );
 ?>
 
-		<label><input name="<?php echo $name; ?>" value="1" type="checkbox"<?php echo $checked; ?> /> <?php echo $label; ?></label><br />
+		<label><input name="<?php echo $name; ?>" value="1" type="checkbox"<?php echo $checked; ?><?php bb_tabindex(); ?> /> <?php echo $label; ?></label><br />
 
 <?php endforeach; ?>
 
@@ -2688,7 +2846,7 @@
 	</th>
 	<td>
 		<?php if ( 'checkbox' == $type && isset($label[5]) ) echo "<label for='$name'>"; ?>
-		<input name="<?php echo $name; ?>" id="<?php echo $name; ?>" type="<?php echo $type; ?>"<?php echo $checked; ?> value="<?php echo $value; ?>" />
+		<input name="<?php echo $name; ?>" id="<?php echo $name; ?>" type="<?php echo $type; ?>"<?php echo $checked; ?> value="<?php echo $value; ?>"<?php bb_tabindex(); ?> />
 		<?php if ( 'checkbox' == $type && isset($label[5]) ) echo esc_html( $label[5] ) . "</label>"; ?>
 	</td>
 </tr>
@@ -2725,16 +2883,16 @@
 <table>
 <tr class="<?php echo $class; ?>">
 	<th scope="row" rowspan="2">
-		<label for="pass1"><?php _e('New password'); ?></label>
+		<label for="pass1"><?php _e( 'New password' ); ?></label>
 		<?php echo $message; ?>
 	</th>
 	<td>
-		<input name="pass1" type="password" id="pass1" autocomplete="off" />
+		<input name="pass1" type="password" id="pass1" autocomplete="off"<?php bb_tabindex(); ?> />
 	</td>
 </tr>
 <tr class="<?php echo $class; ?>">
 	<td>
-		<input name="pass2" type="password" id="pass2" autocomplete="off" />
+		<input name="pass2" type="password" id="pass2" autocomplete="off"<?php bb_tabindex(); ?> />
 	</td>
 </tr>
 <tr class="pass-strength">
@@ -3318,11 +3476,13 @@
 
 	$r = '';
 	if ( !$options_only ) {
-		if ( $tab ) {
+		if ( $tab == true )
+			$tab = bb_get_tabindex();
+		elseif ( is_numeric( $tab ) )
 			$tab = ' tabindex="' . $tab . '"';
-		} else {
+		else
 			$tab = '';
-		}
+		
 		$r .= '<select name="' . $name . '" id="' . $id . '"' . $tab . '>' . "\n";
 	}
 	if ( $none )
Index: bb-settings.php
===================================================================
--- bb-settings.php	(revision 2442)
+++ bb-settings.php	(working copy)
@@ -1213,8 +1213,15 @@
  */
 $page = bb_get_uri_page();
 
+/**
+ * Tabindex value
+ *
+ * @since 1.1
+ */
+$bb_tabindex = '1';
 
 
+
 /**
  * Initialisation complete API hook
  */
Index: bb-templates/kakumei/404.php
===================================================================
--- bb-templates/kakumei/404.php	(revision 2442)
+++ bb-templates/kakumei/404.php	(working copy)
@@ -1,9 +1,15 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Page not found!'); ?></div>
+<?php bb_auto_crumbs( 'force=404' ); /* Crumbs wouldn't have loaded on the previous call in header.php */ ?>
 
-<h2 id="http404"><?php _e('Page not found!'); ?></h2>
+<h2 id="http404"><?php _e( 'Page not found!' ); ?></h2>
 
-<p><?php _e('I\'m sorry, but there is nothing at this URL.'); ?></p>
+<?php do_action( 'bb_404_before_message' ); ?>
 
-<?php bb_get_footer(); ?>
+<p><?php printf( __( 'We\'re sorry, but there is nothing at this page. You may want to go back to the <a href="%s">forums</a> or search below:' ), bb_get_uri() ); ?></p>
+
+<?php bb_topic_search_form( array( 'action' => bb_get_uri( 'search.php' ) ), new BB_Query_Form ); ?>
+
+<?php do_action( 'bb_404_after_message' ); ?>
+
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/edit-form.php
===================================================================
--- bb-templates/kakumei/edit-form.php	(revision 2442)
+++ bb-templates/kakumei/edit-form.php	(working copy)
@@ -1,19 +1,21 @@
-
 <?php if ( $topic_title ) : ?>
 <p role="main">
-  <label><?php _e('Topic:'); ?><br />
-
-  <input name="topic" type="text" id="topic" size="50" maxlength="80"  value="<?php echo esc_attr( get_topic_title() ); ?>" />
-</label>
+	<label><?php _e( 'Topic:' ); ?><br />
+		<input name="topic" type="text" id="topic" size="50" maxlength="80" value="<?php echo esc_attr( get_topic_title() ); ?>"<?php bb_tabindex(); ?> />
+	</label>
 </p>
 <?php endif; do_action( 'edit_form_pre_post' ); ?>
-<p><label><?php _e('Post:'); ?><br />
-  <textarea name="post_content" cols="50" rows="8" id="post_content"><?php echo apply_filters('edit_text', get_post_text() ); ?></textarea>
-  </label>
+
+<p>
+	<label><?php _e( 'Post:' ); ?><br />
+		<textarea name="post_content" cols="50" rows="8" id="post_content"<?php bb_tabindex(); ?>><?php echo apply_filters( 'edit_text', get_post_text() ); ?></textarea>
+	</label>
 </p>
+
 <p class="submit">
-<input type="submit" name="Submit" value="<?php echo esc_attr__( 'Edit Post &raquo;' ); ?>" />
-<input type="hidden" name="post_id" value="<?php post_id(); ?>" />
-<input type="hidden" name="topic_id" value="<?php topic_id(); ?>" />
+	<input type="submit" name="Submit" value="<?php esc_attr_e( 'Edit Post &raquo;' ); ?>"<?php bb_tabindex(); ?> />
+	<input type="hidden" name="post_id" value="<?php post_id(); ?>" />
+	<input type="hidden" name="topic_id" value="<?php topic_id(); ?>" />
 </p>
-<p><?php _e('Allowed markup:'); ?> <code><?php allowed_markup(); ?></code>. <br /><?php _e('Put code in between <code>`backticks`</code>.'); ?></p>
+
+<p id="post-form-allowed-container" class="allowed"><?php printf( __( 'Allowed markup: %s.' ), '<code>' . get_allowed_markup() . '</code>' ); ?><br /><?php _e( 'You can also put code in between backtick ( <code>`</code> ) characters.' ); ?></p>
\ No newline at end of file
Index: bb-templates/kakumei/edit-post.php
===================================================================
--- bb-templates/kakumei/edit-post.php	(revision 2442)
+++ bb-templates/kakumei/edit-post.php	(working copy)
@@ -1,6 +1,5 @@
 <?php bb_get_header(); ?>
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Edit Post'); ?></div>
 
 <?php edit_form(); ?>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/favorites.php
===================================================================
--- bb-templates/kakumei/favorites.php	(revision 2442)
+++ bb-templates/kakumei/favorites.php	(working copy)
@@ -1,54 +1,31 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <a href="<?php user_profile_link( $user_id ); ?>"><?php echo get_user_display_name( $user_id ); ?></a> &raquo; <?php _e('Favorites'); ?></div>
-
 <h2 id="userlogin" role="main"><?php echo get_user_display_name( $user->ID ); ?> <small>(<?php echo get_user_name( $user->ID ); ?>)</small> <?php _e( 'favorites' ); ?><?php if ( $topics ) printf( __( ' - %d' ), $favorites_total ); ?></h2>
 
+<?php do_action( 'bb_favorites_before_message' ); ?>
+
 <p><?php _e( 'Favorites allow members to create a custom <abbr title="Really Simple Syndication">RSS</abbr> feed which pulls recent replies to the topics they specify.' ); ?></p>
+
 <?php if ( bb_current_user_can( 'edit_favorites_of', $user_id ) ) : ?>
 <p><?php _e( 'To add topics to your list of favorites, just click the "Add to Favorites" link found on that topic&#8217;s page.' ); ?></p>
 <?php endif; ?>
 
+<?php bb_kakumei_topics_table(); ?>
+
 <?php if ( $topics ) : ?>
 
-<table id="favorites">
-<tr>
-	<th><?php _e('Topic'); ?></th>
-	<th><?php _e('Posts'); ?></th>
-	<!-- <th><?php _e('Voices'); ?></th> -->
-	<th><?php _e('Last Poster'); ?></th>
-	<th><?php _e('Freshness'); ?></th>
-<?php if ( bb_current_user_can( 'edit_favorites_of', $user_id ) ) : ?>
-	<th><?php _e('Remove'); ?></th>
-<?php endif; ?>
-</tr>
+<p class="rss-link"><a href="<?php favorites_rss_link( $user_id ); ?>" class="rss-link"><?php _e( '<abbr title="Really Simple Syndication">RSS</abbr> feed for these favorites' ); ?></a></p>
 
-<?php foreach ( $topics as $topic ) : ?>
-<tr<?php topic_class(); ?>>
-	<td><?php bb_topic_labels(); ?> <a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></td>
-	<td class="num"><?php topic_posts(); ?></td>
-	<!-- <td class="num"><?php bb_topic_voices(); ?></td> -->
-	<td class="num"><?php topic_last_poster(); ?></td>
-	<td class="num"><a href="<?php topic_last_post_link(); ?>" title="<?php topic_time(array('format'=>'datetime')); ?>"><?php topic_time(); ?></a></td>
-<?php if ( bb_current_user_can( 'edit_favorites_of', $user_id ) ) : ?>
-	<td class="num">[<?php user_favorites_link('', array('mid'=>'&times;'), $user_id); ?>]</td>
-<?php endif; ?>
-</tr>
-<?php endforeach; ?>
-</table>
-
-<p class="rss-link"><a href="<?php favorites_rss_link( $user_id ); ?>" class="rss-link"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for these favorites'); ?></a></p>
-
-<?php favorites_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?>
-
 <?php else: if ( $user_id == bb_get_current_user_info( 'id' ) ) : ?>
 
-<p><?php _e('You currently have no favorites.'); ?></p>
+<p><?php _e( 'You currently have no favorites.' ); ?></p>
 
 <?php else : ?>
 
-<p><?php echo get_user_name( $user_id ); ?> <?php _e('currently has no favorites.'); ?></p>
+<p><?php printf( __( '%s currently has no favorites.' ), get_user_name( $user_id ) ); ?></p>
 
 <?php endif; endif; ?>
 
-<?php bb_get_footer(); ?>
+<?php do_action( 'bb_favorites_after_message' ); ?>
+
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/footer.php
===================================================================
--- bb-templates/kakumei/footer.php	(revision 2442)
+++ bb-templates/kakumei/footer.php	(working copy)
@@ -1,7 +1,8 @@
+		<?php do_action( 'bb_before_footer' ); ?>
 		</div>
 	</div>
 	<div id="footer" role="contentinfo">
-		<p><?php printf(__('%1$s is proudly powered by <a href="%2$s">bbPress</a>.'), bb_option('name'), "http://bbpress.org") ?></p>
+		<p><?php printf(__( '%1$s is proudly powered by <a href="%2$s">bbPress</a>.' ), bb_get_option( 'name' ), 'http://bbpress.org' ); ?></p>
 
 		<!-- If you like showing off the fact that your server rocks -->
 		<!-- <p class="showoff">
@@ -16,7 +17,7 @@
 		</p> -->
 	</div>
 
-<?php do_action('bb_foot'); ?>
+<?php do_action( 'bb_foot' ); ?>
 
 </body>
-</html>
+</html>
\ No newline at end of file
Index: bb-templates/kakumei/forum.php
===================================================================
--- bb-templates/kakumei/forum.php	(revision 2442)
+++ bb-templates/kakumei/forum.php	(working copy)
@@ -1,67 +1,39 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a><?php bb_forum_bread_crumb(); ?></div>
+<?php bb_kakumei_topics_table(); ?>
 
-<?php if ( $topics || $stickies ) : ?>
-
-<table id="latest" role="main">
-<tr>
-	<th><?php _e('Topic'); ?> &#8212; <?php bb_new_topic_link(); ?></th>
-	<th><?php _e('Posts'); ?></th>
-	<!-- <th><?php _e('Voices'); ?></th> -->
-	<th><?php _e('Last Poster'); ?></th>
-	<th><?php _e('Freshness'); ?></th>
-</tr>
-
-<?php if ( $stickies ) : foreach ( $stickies as $topic ) : ?>
-<tr<?php topic_class(); ?>>
-	<td><?php bb_topic_labels(); ?> <big><a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></big><?php topic_page_links(); ?></td>
-	<td class="num"><?php topic_posts(); ?></td>
-	<!-- <td class="num"><?php bb_topic_voices(); ?></td> -->
-	<td class="num"><?php topic_last_poster(); ?></td>
-	<td class="num"><a href="<?php topic_last_post_link(); ?>" title="<?php topic_time(array('format'=>'datetime')); ?>"><?php topic_time(); ?></a></td>
-</tr>
-<?php endforeach; endif; ?>
-
-<?php if ( $topics ) : foreach ( $topics as $topic ) : ?>
-<tr<?php topic_class(); ?>>
-	<td><?php bb_topic_labels(); ?> <a href="<?php topic_link(); ?>"><?php topic_title(); ?></a><?php topic_page_links(); ?></td>
-	<td class="num"><?php topic_posts(); ?></td>
-	<!-- <td class="num"><?php bb_topic_voices(); ?></td> -->
-	<td class="num"><?php topic_last_poster(); ?></td>
-	<td class="num"><a href="<?php topic_last_post_link(); ?>" title="<?php topic_time(array('format'=>'datetime')); ?>"><?php topic_time(); ?></a></td>
-</tr>
-<?php endforeach; endif; ?>
-</table>
-<p class="rss-link"><a href="<?php bb_forum_posts_rss_link(); ?>" class="rss-link"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for this forum'); ?></a></p>
-<?php forum_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?>
-<?php endif; ?>
-
 <?php if ( bb_forums( $forum_id ) ) : ?>
-<h2><?php _e('Subforums'); ?></h2>
+<h2><?php _e( 'Subforums' ); ?></h2>
 <table id="forumlist">
-
-<tr>
-	<th><?php _e('Main Theme'); ?></th>
-	<th><?php _e('Topics'); ?></th>
-	<th><?php _e('Posts'); ?></th>
-</tr>
-
+	<thead>
+		<tr>
+			<th><?php _e( 'Main Theme' ); ?></th>
+			<th><?php _e( 'Topics' ); ?></th>
+			<th><?php _e( 'Posts' ); ?></th>
+			<?php do_action( 'bb_subforum_table_thead', $forum_id ); ?>
+		</tr>
+	</thead>
+	
+	<tbody>
 <?php while ( bb_forum() ) : ?>
-<?php if (bb_get_forum_is_category()) : ?>
-<tr<?php bb_forum_class('bb-category'); ?>>
-	<td colspan="3"><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><?php forum_description( array( 'before' => '<small> &#8211; ', 'after' => '</small>' ) ); ?><?php bb_forum_pad( '</div>' ); ?></td>
-</tr>
-<?php continue; endif; ?>
-<tr<?php bb_forum_class(); ?>>
-	<td><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><?php forum_description( array( 'before' => '<small> &#8211; ', 'after' => '</small>' ) ); ?><?php bb_forum_pad( '</div>' ); ?></td>
-	<td class="num"><?php forum_topics(); ?></td>
-	<td class="num"><?php forum_posts(); ?></td>
-</tr>
+	<?php if ( bb_get_forum_is_category() ) : ?>
+		<tr<?php bb_forum_class( 'bb-category' ); ?>>
+			<td colspan="3"><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><?php forum_description( array( 'before' => '<small> &#8211; ', 'after' => '</small>' ) ); ?><?php bb_forum_pad( '</div>' ); ?></td>
+			<?php do_action( 'bb_subforum_table_td', get_forum_id() ); ?>
+		</tr>
+	<?php continue; endif; ?>
+		<tr<?php bb_forum_class(); ?>>
+			<td><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><?php forum_description( array( 'before' => '<small> &#8211; ', 'after' => '</small>' ) ); ?><?php bb_forum_pad( '</div>' ); ?></td>
+			<td class="num"><?php forum_topics(); ?></td>
+			<td class="num"><?php forum_posts(); ?></td>
+			<?php do_action( 'bb_subforum_table_td', get_forum_id() ); ?>
+		</tr>
 <?php endwhile; ?>
+	</tbody>
+
 </table>
 <?php endif; ?>
 
 <?php post_form(); ?>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/front-page.php
===================================================================
--- bb-templates/kakumei/front-page.php	(revision 2442)
+++ bb-templates/kakumei/front-page.php	(working copy)
@@ -2,89 +2,65 @@
 
 <?php if ( $forums ) : ?>
 
-<div id="hottags" role="main">
-<h2><?php _e('Hot Tags'); ?></h2>
-<p class="frontpageheatmap"><?php bb_tag_heat_map(); ?></p>
+<div id="sidebar">
+	<div id="hottags">
+		<h2><?php _e( 'Hot Tags' ); ?></h2>
+		<p class="frontpageheatmap"><?php bb_tag_heat_map(); ?></p>
+	</div>
+	<?php if ( bb_is_user_logged_in() ) : ?>
+	<div id="viewdiv">
+		<h2><?php _e( 'Views' ); ?></h2>
+		<ul id="views">
+			<?php foreach ( bb_get_views() as $the_view => $title ) : ?>
+			<li<?php alt_class( 'views', 'view' ); ?>><a href="<?php view_link( $the_view ); ?>"><?php view_name( $the_view ); ?></a></li>
+			<?php endforeach; ?>
+		</ul>
+	</div>
+	<?php endif; // bb_is_user_logged_in() ?>
 </div>
 
 <div id="discussions">
-<?php if ( $topics || $super_stickies ) : ?>
-
-<h2><?php _e('Latest Discussions'); ?></h2>
-
-<table id="latest">
-<tr>
-	<th><?php _e('Topic'); ?> &#8212; <?php bb_new_topic_link(); ?></th>
-	<th><?php _e('Posts'); ?></th>
-	<!-- <th><?php _e('Voices'); ?></th> -->
-	<th><?php _e('Last Poster'); ?></th>
-	<th><?php _e('Freshness'); ?></th>
-</tr>
-
-<?php if ( $super_stickies ) : foreach ( $super_stickies as $topic ) : ?>
-<tr<?php topic_class(); ?>>
-	<td><?php bb_topic_labels(); ?> <big><a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></big><?php topic_page_links(); ?></td>
-	<td class="num"><?php topic_posts(); ?></td>
-	<!-- <td class="num"><?php bb_topic_voices(); ?></td> -->
-	<td class="num"><?php topic_last_poster(); ?></td>
-	<td class="num"><a href="<?php topic_last_post_link(); ?>" title="<?php topic_time(array('format'=>'datetime')); ?>"><?php topic_time(); ?></a></td>
-</tr>
-<?php endforeach; endif; // $super_stickies ?>
-
-<?php if ( $topics ) : foreach ( $topics as $topic ) : ?>
-<tr<?php topic_class(); ?>>
-	<td><?php bb_topic_labels(); ?> <a href="<?php topic_link(); ?>"><?php topic_title(); ?></a><?php topic_page_links(); ?></td>
-	<td class="num"><?php topic_posts(); ?></td>
-	<!-- <td class="num"><?php bb_topic_voices(); ?></td> -->
-	<td class="num"><?php topic_last_poster(); ?></td>
-	<td class="num"><a href="<?php topic_last_post_link(); ?>" title="<?php topic_time(array('format'=>'datetime')); ?>"><?php topic_time(); ?></a></td>
-</tr>
-<?php endforeach; endif; // $topics ?>
-</table>
-<?php bb_latest_topics_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?>
-<?php endif; // $topics or $super_stickies ?>
-
-<?php if ( bb_forums() ) : ?>
-<h2><?php _e('Forums'); ?></h2>
-<table id="forumlist">
-
-<tr>
-	<th><?php _e('Main Theme'); ?></th>
-	<th><?php _e('Topics'); ?></th>
-	<th><?php _e('Posts'); ?></th>
-</tr>
-<?php while ( bb_forum() ) : ?>
-<?php if (bb_get_forum_is_category()) : ?>
-<tr<?php bb_forum_class('bb-category'); ?>>
-	<td colspan="3"><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><?php forum_description( array( 'before' => '<small> &#8211; ', 'after' => '</small>' ) ); ?><?php bb_forum_pad( '</div>' ); ?></td>
-</tr>
-<?php continue; endif; ?>
-<tr<?php bb_forum_class(); ?>>
-	<td><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><?php forum_description( array( 'before' => '<small> &#8211; ', 'after' => '</small>' ) ); ?><?php bb_forum_pad( '</div>' ); ?></td>
-	<td class="num"><?php forum_topics(); ?></td>
-	<td class="num"><?php forum_posts(); ?></td>
-</tr>
-<?php endwhile; ?>
-</table>
-<?php endif; // bb_forums() ?>
-
-<?php if ( bb_is_user_logged_in() ) : ?>
-<div id="viewdiv">
-<h2><?php _e('Views'); ?></h2>
-<ul id="views">
-<?php foreach ( bb_get_views() as $the_view => $title ) : ?>
-<li class="view"><a href="<?php view_link( $the_view ); ?>"><?php view_name( $the_view ); ?></a></li>
-<?php endforeach; ?>
-</ul>
+	<?php bb_kakumei_topics_table(); /* Open up functions.php to customize the table */ ?>
+	
+	<?php if ( bb_forums() ) : ?>
+	
+	<?php do_action( 'bb_before_forum_table' ); ?>
+	
+	<h2><?php _e( 'Forums' ); ?></h2>
+	<table id="forumlist">
+		<thead>
+			<tr>
+				<th><?php _e( 'Main Theme' ); ?></th>
+				<th><?php _e( 'Topics' ); ?></th>
+				<th><?php _e( 'Posts' ); ?></th>
+				<?php do_action( 'bb_forum_table_thead' ); ?>
+			</tr>
+		</thead>
+		
+		<tbody>
+			<?php while ( bb_forum() ) : ?>
+			<?php if ( bb_get_forum_is_category() ) : ?>
+			<tr<?php bb_forum_class( 'bb-category' ); ?>>
+				<td colspan="3"><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><?php forum_description( array( 'before' => '<small> &#8211; ', 'after' => '</small>' ) ); ?><?php bb_forum_pad( '</div>' ); ?></td>
+				<?php do_action( 'bb_forum_table_td', get_forum_id() ); ?>
+			</tr>
+			<?php continue; endif; ?>
+			<tr<?php bb_forum_class(); ?>>
+				<td><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><?php forum_description( array( 'before' => '<small> &#8211; ', 'after' => '</small>' ) ); ?><?php bb_forum_pad( '</div>' ); ?></td>
+				<td class="num"><?php forum_topics(); ?></td>
+				<td class="num"><?php forum_posts(); ?></td>
+				<?php do_action( 'bb_forum_table_td', get_forum_id() ); ?>
+			</tr>
+			<?php endwhile; ?>
+		</tbody>
+	</table>
+	
+	<?php do_action( 'bb_before_forum_table' ); ?>
+	<?php endif; // bb_forums() ?>
+	
 </div>
-<?php endif; // bb_is_user_logged_in() ?>
+<?php else : //$forums ?>
+	<?php post_form( array( 'h2' => __( 'Start New Topic' ) . '<span> &#8212; <a href="' . bb_get_uri() . '">' . __( 'cancel' ) . '</a>' ) ); ?>
+<?php endif; //$forums ?>
 
-</div>
-
-<?php else : // $forums ?>
-
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Add New Topic'); ?></div>
-
-<?php post_form(); endif; // $forums ?>
-
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/header.php
===================================================================
--- bb-templates/kakumei/header.php	(revision 2442)
+++ bb-templates/kakumei/header.php	(working copy)
@@ -2,17 +2,16 @@
 $_head_profile_attr = '';
 if ( bb_is_profile() ) {
 	global $self;
-	if ( !$self ) {
-		$_head_profile_attr = ' profile="http://www.w3.org/2006/03/hcard"';
-	}
+	if ( !$self ) $_head_profile_attr = ' profile="http://www.w3.org/2006/03/hcard"';
 }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"<?php bb_language_attributes( '1.1' ); ?>>
+
 <head<?php echo $_head_profile_attr; ?>>
 	<meta http-equiv="X-UA-Compatible" content="IE=8" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title><?php bb_title() ?></title>
+	<title><?php bb_title(); ?></title>
 	<link rel="stylesheet" href="<?php bb_stylesheet_uri(); ?>" type="text/css" />
 <?php if ( 'rtl' == bb_get_option( 'text_direction' ) ) : ?>
 	<link rel="stylesheet" href="<?php bb_stylesheet_uri( 'rtl' ); ?>" type="text/css" />
@@ -27,14 +26,16 @@
 	<div id="wrapper">
 		<div id="header" role="banner">
 			<h1><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a></h1>
-			<?php if ( bb_get_option('description') ) : ?><p class="description"><?php bb_option('description'); ?></p><?php endif; ?>
-
+			<?php if ( bb_get_option( 'description' ) ) : ?><p class="description"><?php bb_option( 'description' ); ?></p><?php endif; ?>
+			
 <?php if ( !in_array( bb_get_location(), array( 'login-page', 'register-page' ) ) ) login_form(); ?>
-
+			
 			<div class="search">
 <?php search_form(); ?>
 			</div>
 		</div>
 		<div id="main">
-
+			
 <?php if ( bb_is_profile() ) profile_menu(); ?>
+<?php bb_auto_crumbs(); ?>
+			
\ No newline at end of file
Index: bb-templates/kakumei/logged-in.php
===================================================================
--- bb-templates/kakumei/logged-in.php	(revision 2442)
+++ bb-templates/kakumei/logged-in.php	(working copy)
@@ -1,5 +1,5 @@
 <p class="login">
-	<?php printf(__('Welcome, %1$s'), bb_get_profile_link(bb_get_current_user_info( 'name' )));?>
+	<?php printf( __( 'Welcome, %s' ), bb_get_profile_link( bb_get_current_user_info( 'name' ) ) ); ?>
 	<?php bb_admin_link( 'before= | ' );?>
 	| <?php bb_logout_link(); ?>
-</p>
+</p>
\ No newline at end of file
Index: bb-templates/kakumei/login-form.php
===================================================================
--- bb-templates/kakumei/login-form.php	(revision 2442)
+++ bb-templates/kakumei/login-form.php	(working copy)
@@ -1,33 +1,33 @@
 <form class="login" method="post" action="<?php bb_uri( 'bb-login.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_USER_FORMS ); ?>">
 	<p>
-		<?php
+	<?php
 	printf(
 		__( '<a href="%1$s">Register</a> or log in - <a href="%2$s">lost password?</a>' ),
 		bb_get_uri( 'register.php', null, BB_URI_CONTEXT_A_HREF + BB_URI_CONTEXT_BB_USER_FORMS ),
 		bb_get_uri( 'bb-login.php', array( 'action' => 'lostpassword' ), BB_URI_CONTEXT_A_HREF + BB_URI_CONTEXT_BB_USER_FORMS )
 	);
 	?>
-
 	</p>
+	
 	<div>
 		<label>
-			<?php _e('Username'); ?><br />
-			<input name="log" type="text" id="quick_user_login" size="13" maxlength="40" value="<?php if (!is_bool($user_login)) echo $user_login; ?>" tabindex="1" />
+			<?php _e( 'Username' ); ?><br />
+			<input name="log" type="text" id="quick_user_login" size="13" maxlength="40" value="<?php if ( !is_bool( $user_login ) ) echo $user_login; ?>"<?php bb_tabindex(); ?> />
 		</label>
 		<label>
 			<?php _e( 'Password' ); ?><br />
-			<input name="pwd" type="password" id="quick_password" size="13" maxlength="40" tabindex="2" />
+			<input name="pwd" type="password" id="quick_password" size="13" maxlength="40"<?php bb_tabindex(); ?> />
 		</label>
+		
 		<input name="redirect_to" type="hidden" value="<?php echo $re; ?>" />
 		<?php wp_referer_field(); ?>
-
-		<input type="submit" name="Submit" class="submit" value="<?php echo esc_attr__( 'Log in &raquo;' ); ?>" tabindex="4" />
+		<input type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Log in &raquo;' ); ?>"<?php bb_tabindex( array( 'val' => 4, 'set_to_value' => 3 ) ); ?> />
 	</div>
+	
 	<div class="remember">
 		<label>
-			<input name="rememberme" type="checkbox" id="quick_remember" value="1" tabindex="3"<?php echo $remember_checked; ?> />
-			<?php _e('Remember me'); ?>
-
+			<input name="rememberme" type="checkbox" id="quick_remember" value="1"<?php bb_tabindex( array( 'set_to_value' => 5 ) ); ?><?php echo $remember_checked; ?> />
+			<?php _e( 'Remember me' ); ?>
 		</label>
 	</div>
 </form>
\ No newline at end of file
Index: bb-templates/kakumei/login.php
===================================================================
--- bb-templates/kakumei/login.php	(revision 2442)
+++ bb-templates/kakumei/login.php	(working copy)
@@ -1,75 +1,72 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Log in'); ?></div>
+<h2 id="userlogin" role="main"><?php !empty( $user_login ) ? _e( 'Log in Failed' ) : _e( 'Log in' ) ; ?></h2>
 
-<h2 id="userlogin" role="main"><?php !empty( $user_login ) ? _e('Log in Failed') : _e('Log in') ; ?></h2>
-
-<form method="post" action="<?php bb_uri('bb-login.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_USER_FORMS); ?>">
-<fieldset>
-<table>
+<form method="post" action="<?php bb_uri( 'bb-login.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_USER_FORMS ); ?>">
+	<fieldset>
+		<table>
 <?php
-	$user_login_error = $bb_login_error->get_error_message( 'user_login' );
-	$user_email_error = $bb_login_error->get_error_message( 'user_email' );
-	$user_password_error = $bb_login_error->get_error_message( 'password' );
+	$user_login_error	= $bb_login_error->get_error_message( 'user_login' );
+	$user_email_error	= $bb_login_error->get_error_message( 'user_email' );
+	$user_password_error	= $bb_login_error->get_error_message( 'password' );
 ?>
-	<tr valign="top" class="form-field <?php if ( $user_login_error || $user_email_error ) echo ' form-invalid error'; ?>">
-		<th scope="row">
-			<label for="user_login"><?php _e('Username'); ?></label>
-			<?php if ( $user_login_error ) echo "<em>$user_login_error</em>"; ?>
-			<?php if ( $user_email_error ) echo "<em>$user_email_error</em>"; ?>
-		</th>
-		<td>
-			<input name="log" id="user_login" type="text" value="<?php echo $user_login; ?>" />
-		</td>
-	</tr>
-	<tr valign="top" class="form-field <?php if ( $user_password_error ) echo 'form-invalid error'; ?>">
-		<th scope="row">
-			<label for="password"><?php _e('Password'); ?></label>
-			<?php if ( $user_password_error ) echo "<em>$user_password_error</em>"; ?>
-		</th>
-		<td>
-			<input name="pwd" id="password" type="password" />
-		</td>
-	</tr>
-
-	<tr valign="top" class="form-field">
-		<th scope="row"><label for="remember"><?php _e('Remember me'); ?></label></th>
-		<td><input name="rememberme" type="checkbox" id="remember" value="1"<?php echo $remember_checked; ?> /></td>
-	</tr>
-	<tr>
-		<th scope="row">&nbsp;</th>
-		<td>
-			<input name="redirect_to" type="hidden" value="<?php echo $redirect_to; ?>" />
-			<input type="submit" value="<?php echo esc_attr( !empty( $user_login ) ? __( 'Try Again &raquo;' ): __( 'Log in &raquo;' ) ); ?>" />
-			<?php wp_referer_field(); ?>
-		</td>
-	</tr>
-</table>
-
-</fieldset>
+			<tr valign="top" class="form-field <?php if ( $user_login_error || $user_email_error ) echo ' form-invalid error'; ?>">
+				<th scope="row">
+					<label for="user_login"><?php _e( 'Username' ); ?></label>
+					<?php if ( $user_login_error ) echo "<em>$user_login_error</em>"; ?>
+					<?php if ( $user_email_error ) echo "<em>$user_email_error</em>"; ?>
+				</th>
+				<td>
+					<input name="log" id="user_login" type="text" value="<?php echo $user_login; ?>"<?php bb_tabindex(); ?> />
+				</td>
+			</tr>
+			<tr valign="top" class="form-field <?php if ( $user_password_error ) echo 'form-invalid error'; ?>">
+				<th scope="row">
+					<label for="password"><?php _e( 'Password' ); ?></label>
+					<?php if ( $user_password_error ) echo "<em>$user_password_error</em>"; ?>
+				</th>
+				<td>
+					<input name="pwd" id="password" type="password"<?php bb_tabindex(); ?> />
+				</td>
+			</tr>
+		
+			<tr valign="top" class="form-field">
+				<th scope="row"><label for="remember"><?php _e( 'Remember me' ); ?></label></th>
+				<td><input name="rememberme" type="checkbox" id="remember" value="1"<?php echo $remember_checked; bb_tabindex(); ?> /></td>
+			</tr>
+			<tr>
+				<th scope="row">&nbsp;</th>
+				<td>
+					<input name="redirect_to" type="hidden" value="<?php echo $redirect_to; ?>" />
+					<input type="submit" value="<?php echo esc_attr( !empty( $user_login ) ? __( 'Try Again &raquo;' ): __( 'Log in &raquo;' ) ); ?>"<?php bb_tabindex(); ?> />
+					<?php wp_referer_field(); ?>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
 </form>
 
 <h2 id="passwordrecovery"><?php _e( 'Password Recovery' ); ?></h2>
-<form method="post" action="<?php bb_uri('bb-reset-password.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_USER_FORMS); ?>">
+<form method="post" action="<?php bb_uri( 'bb-reset-password.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_USER_FORMS ); ?>">
 <fieldset>
-	<p><?php _e('To recover your password, enter your information below.'); ?></p>
+	<p><?php _e( 'To recover your password, enter your information below.' ); ?></p>
 	<table>
 		<tr valign="top" class="form-field">
 			<th scope="row">
 				<label for="user_login_reset_password"><?php _e( 'Username' ); ?></label>
 			</th>
 			<td>
-				<input name="user_login" id="user_login_reset_password" type="text" value="<?php echo $user_login; ?>" />
+				<input name="user_login" id="user_login_reset_password" type="text" value="<?php echo $user_login; ?>"<?php bb_tabindex(); ?> />
 			</td>
 		</tr>
 		<tr valign="top">
 			<th scope="row"></th>
 			<td>
-				<input type="submit" value="<?php echo esc_attr__( 'Recover Password &raquo;' ); ?>" />
+				<input type="submit" value="<?php esc_attr_e( 'Recover Password &raquo;' ); ?>"<?php bb_tabindex(); ?> />
 			</td>
 		</tr>
 	</table>
 </fieldset>
 </form>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/password-reset.php
===================================================================
--- bb-templates/kakumei/password-reset.php	(revision 2442)
+++ bb-templates/kakumei/password-reset.php	(working copy)
@@ -1,20 +1,31 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Log in'); ?></div>
+<h2 role="main"><?php _e( 'Password Reset' ); ?></h2>
 
-<h2 role="main"><?php _e('Password Reset'); ?></h2>
+<?php do_action( 'bb_before_password_reset_message' ); ?>
 
 <?php if ( $error ) : ?>
+
 <p class="notice error"><?php echo $error; ?></p>
+
 <?php else : ?>
+
 <?php switch ( $action ) : ?>
 <?php case ( 'send_key' ) : ?>
-<p class="notice"><?php _e('An email has been sent to the address we have on file for you. If you don&#8217;t get anything within a few minutes, or your email has changed, you may want to get in touch with the webmaster or forum administrator here.'); ?></p>
+<p class="notice"><?php _e( 'An email has been sent to the address we have on file for you. If you don&#8217;t get anything within a few minutes, or your email has changed, you may want to get in touch with the webmaster or forum administrator here.' ); ?></p>
 <?php break; ?>
+
 <?php case ( 'reset_password' ) : ?>
-<p class="notice"><?php _e('Your password has been reset and a new one has been mailed to you.'); ?></p>
+<p class="notice"><?php _e( 'Your password has been reset and a new one has been mailed to you.' ); ?></p>
 <?php break; ?>
+
+<?php default: ?>
+<?php do_action( 'bb_password_reset_message', $action ); ?>
+<?php break; ?>
+
 <?php endswitch; ?>
 <?php endif; ?>
 
-<?php bb_get_footer(); ?>
+<?php do_action( 'bb_after_password_reset_message' ); ?>
+
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/post-form.php
===================================================================
--- bb-templates/kakumei/post-form.php	(revision 2442)
+++ bb-templates/kakumei/post-form.php	(working copy)
@@ -1,52 +1,52 @@
 <?php if ( !bb_is_topic() ) : ?>
 <p id="post-form-title-container">
-	<label for="topic"><?php _e('Title'); ?>
-		<input name="topic" type="text" id="topic" size="50" maxlength="100" tabindex="1" />
+	<label for="topic"><?php _e( 'Title' ); ?>
+		<input name="topic" type="text" id="topic" size="50" maxlength="100"<?php bb_tabindex(); ?> />
 	</label>
 </p>
 <?php endif; do_action( 'post_form_pre_post' ); ?>
 <?php if ( ! bb_is_user_logged_in() && ! bb_is_login_required() )  : 
-	$current_commenter = bb_get_current_commenter();
+	$current_poster = bb_get_current_commenter();
 ?>
 	<p id="post-form-author-container">
-		<label for="author"><?php _e('Author (required)'); ?>
-			<input type="text" name="author" id="author" size="50" aria-required="true" value="<?php echo esc_attr($current_commenter['comment_author']); ?>" />
+		<label for="author"><?php _e( 'Author (required)' ); ?>
+			<input type="text" name="author" id="author" size="50" aria-required="true" value="<?php echo esc_attr( $current_poster['comment_author'] ); ?>"<?php bb_tabindex(); ?> />
 		</label>
 	</p>
 
 	<p id="post-form-email-container">
-		<label for="email"><?php _e('Email (required)'); ?>
-			<input type="text" name="email" id="email" size="50" aria-required="true" value="<?php echo esc_attr($current_commenter['comment_author_email']); ?>" />
+		<label for="email"><?php _e( 'Email (required)' ); ?>
+			<input type="text" name="email" id="email" size="50" aria-required="true" value="<?php echo esc_attr( $current_poster['comment_author_email'] ); ?>"<?php bb_tabindex(); ?> />
 		</label>
 	</p>
 
 	<p id="post-form-url-container">
-		<label for="url"><?php _e('URL'); ?>
-			<input type="text" name="url" id="url" size="50" aria-required="true" value="<?php echo esc_attr($current_commenter['comment_author_url']); ?>" />
+		<label for="url"><?php _e( 'Website' ); ?>
+			<input type="text" name="url" id="url" size="50" value="<?php echo esc_attr( $current_poster['comment_author_url'] ); ?>"<?php bb_tabindex(); ?> />
 		</label>
 
 	</p>
 <?php endif; // end user not logged in but logins aren't required ?>
 
 <p id="post-form-post-container">
-	<label for="post_content"><?php _e('Post'); ?>
-		<textarea name="post_content" cols="50" rows="8" id="post_content" tabindex="3"></textarea>
+	<label for="post_content"><?php _e( 'Post' ); ?>
+		<textarea name="post_content" cols="50" rows="8" id="post_content"<?php bb_tabindex(); ?>></textarea>
 	</label>
 </p>
 <p id="post-form-tags-container">
-	<label for="tags-input"><?php printf(__('Tags (comma separated)'), bb_get_tag_page_link()) ?>
-		<input id="tags-input" name="tags" type="text" size="50" maxlength="100" value="<?php bb_tag_name(); ?>" tabindex="4" />
+	<label for="tags-input"><?php __( 'Tags (comma separated)' ) ?>
+		<input id="tags-input" name="tags" type="text" size="50" maxlength="100" value="<?php bb_tag_name(); ?>"<?php bb_tabindex(); ?> />
 	</label>
 </p>
 <?php if ( bb_is_tag() || bb_is_front() ) : ?>
 <p id="post-form-forum-container">
-	<label for="forum-id"><?php _e('Forum'); ?>
-		<?php bb_new_topic_forum_dropdown(); ?>
+	<label for="forum-id"><?php _e( 'Forum' ); ?>
+		<?php bb_new_topic_forum_dropdown( array( 'tab' => true ) ); ?>
 	</label>
 </p>
 <?php endif; ?>
 <p id="post-form-submit-container" class="submit">
-  <input type="submit" id="postformsub" name="Submit" value="<?php echo esc_attr__( 'Send Post &raquo;' ); ?>" tabindex="4" />
+	<input type="submit" id="postformsub" name="Submit" value="<?php esc_attr_e( 'Send Post &raquo;' ); ?>"<?php bb_tabindex(); ?> />
 </p>
 
-<p id="post-form-allowed-container" class="allowed"><?php _e('Allowed markup:'); ?> <code><?php allowed_markup(); ?></code>. <br /><?php _e('You can also put code in between backtick ( <code>`</code> ) characters.'); ?></p>
+<p id="post-form-allowed-container" class="allowed"><?php printf( __( 'Allowed markup: %s.' ), '<code>' . get_allowed_markup() . '</code>' ); ?><br /><?php _e( 'You can also put code in between backtick ( <code>`</code> ) characters.' ); ?></p>
\ No newline at end of file
Index: bb-templates/kakumei/post.php
===================================================================
--- bb-templates/kakumei/post.php	(revision 2442)
+++ bb-templates/kakumei/post.php	(working copy)
@@ -4,10 +4,12 @@
 				<p>
 					<strong><?php post_author_link(); ?></strong><br />
 					<small><?php post_author_title_link(); ?></small>
+					<?php do_action( 'bb_post_threadauthor_meta', get_post_id() ); ?>
 				</p>
 			</div>
 			<div class="threadpost">
 				<div class="post"><?php post_text(); ?></div>
-				<div class="poststuff"><?php printf( __('Posted %s ago'), bb_get_post_time() ); ?> <a href="<?php post_anchor_link(); ?>">#</a> <?php bb_post_admin(); ?></div>
+				<div class="poststuff"><?php printf( __( 'Posted %s ago' ), bb_get_post_time() ); ?> <a href="<?php post_anchor_link(); ?>">#</a> <?php bb_post_admin(); ?></div>
+				<?php do_action( 'bb_post_threadpost_after_stuff', get_post_id() ); ?>
 			</div>
 		</div>
\ No newline at end of file
Index: bb-templates/kakumei/profile-base.php
===================================================================
--- bb-templates/kakumei/profile-base.php	(revision 2442)
+++ bb-templates/kakumei/profile-base.php	(working copy)
@@ -1,8 +1,7 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <a href="<?php user_profile_link( $user_id ); ?>"><?php echo get_user_display_name( $user_id ); ?></a> &raquo; <?php echo $profile_page_title; ?></div>
 <h2 role="main"><?php echo get_user_name( $user->ID ); ?></h2>
 
 <?php bb_profile_base_content(); ?>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/profile-edit.php
===================================================================
--- bb-templates/kakumei/profile-edit.php	(revision 2442)
+++ bb-templates/kakumei/profile-edit.php	(working copy)
@@ -1,9 +1,5 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb">
-	<a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <a href="<?php user_profile_link( $user_id ); ?>"><?php echo get_user_display_name( $user_id ); ?></a> &raquo; <?php _e( 'Edit Profile' ); ?>
-</div>
-
 <h2 id="userlogin" role="main">
 	<?php echo get_user_display_name( $user->ID ); ?> <small>(<?php echo get_user_name( $user->ID ); ?>)</small>
 </h2>
@@ -34,7 +30,7 @@
 <?php endif; endif; ?>
 
 	<p class="submit right">
-		<input type="submit" name="Submit" value="<?php echo esc_attr__( 'Update Profile &raquo;' ); ?>" />
+		<input type="submit" name="Submit" value="<?php esc_attr_e( 'Update Profile &raquo;' ); ?>" <?php bb_tabindex(); ?> />
 	</p>
 
 </form>
@@ -48,4 +44,4 @@
 
 </form>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/profile.php
===================================================================
--- bb-templates/kakumei/profile.php	(revision 2442)
+++ bb-templates/kakumei/profile.php	(working copy)
@@ -1,87 +1,112 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <a href="<?php user_profile_link( $user_id ); ?>"><?php echo get_user_display_name( $user_id ); ?></a> &raquo; <?php _e('Profile') ?></div>
-
 <div class="vcard" role="main">
 
 <?php if ( $avatar = bb_get_avatar( $user->ID ) ) : ?>
-<div id="useravatar"><?php echo $avatar; ?></div>
-<?php unset($avatar); endif; ?>
-<h2 id="userlogin"><span class="fn"><?php echo get_user_display_name( $user->ID ); ?></span> <small>(<span class="nickname"><?php echo get_user_name( $user->ID ); ?></span>)</small></h2>
+	<div id="useravatar"><?php echo $avatar; ?></div>
+<?php unset( $avatar ); endif; ?>
 
+	<h2 id="userlogin">
+		<span class="fn"><?php echo get_user_display_name( $user->ID ); ?></span> <small>(<span class="nickname"><?php echo get_user_name( $user->ID ); ?></span>)</small>
+	</h2>
+
 <?php if ( $updated ) : ?>
-<div class="notice">
-<p><?php _e('Profile updated'); ?>. <a href="<?php profile_tab_link( $user_id, 'edit' ); ?>"><?php _e('Edit again &raquo;'); ?></a></p>
-</div>
+	<div class="notice">
+		<p><?php _e( 'Profile updated.' ); ?> <a href="<?php profile_tab_link( $user_id, 'edit' ); ?>"><?php esc_attr_e( 'Edit again &raquo;' ); ?></a></p>
+	</div>
 <?php elseif ( $user_id == bb_get_current_user_info( 'id' ) ) : ?>
-<p>
-<?php _e('This is how your profile appears to a logged in member.'); ?>
+	<p>
+		<?php _e( 'This is how your profile appears to a logged in member.' ); ?>
 
-<?php if (bb_current_user_can( 'edit_user', $user->ID )) : ?>
-<?php printf(__('You may <a href="%1$s">edit this information</a>.'), esc_attr( get_profile_tab_link( $user_id, 'edit' ) ) ); ?>
+<?php if ( bb_current_user_can( 'edit_user', $user->ID ) ) : ?>
+		<?php printf( __( 'You may <a href="%s">edit this information</a>.' ), esc_attr( get_profile_tab_link( $user_id, 'edit' ) ) ); ?>
 <?php endif; ?>
-</p>
+	</p>
 
-<?php if (bb_current_user_can( 'edit_favorites_of', $user->ID )) : ?>
-<p><?php printf(__('You can also <a href="%1$s">manage your favorites</a> and subscribe to your favorites&#8217; <a href="%2$s"><abbr title="Really Simple Syndication">RSS</abbr> feed</a>.'), esc_attr( get_favorites_link() ), esc_attr( get_favorites_rss_link() )); ?></p>
+<?php if ( bb_current_user_can( 'edit_favorites_of', $user->ID ) ) : ?>
+	<p><?php printf( __( 'You can also <a href="%1$s">manage your favorites</a> and subscribe to your favorites&#8217; <a href="%2$s"><abbr title="Really Simple Syndication">RSS</abbr> feed</a>.' ), esc_attr( get_favorites_link() ), esc_attr( get_favorites_rss_link() ) ); ?></p>
 <?php endif; ?>
 <?php endif; ?>
 
+<div class="clear"></div>
+
 <?php bb_profile_data(); ?>
 
 </div>
 
-<h3 id="useractivity"><?php _e('User Activity') ?></h3>
+<h3 id="useractivity"><?php _e( 'User Activity' ) ?></h3>
 
-<div id="user-replies" class="user-recent"><h4><?php _e('Recent Replies'); ?></h4>
-<?php if ( $posts ) : ?>
-<ol>
-<?php foreach ($posts as $bb_post) : $topic = get_topic( $bb_post->topic_id ) ?>
-<li<?php alt_class('replies'); ?>>
-	<a href="<?php topic_link(); ?>"><?php topic_title(); ?></a> -
-	<?php if ( $user->ID == bb_get_current_user_info( 'id' ) ) printf(__('You last replied: <a href="%1$s">%2$s ago</a>'), get_post_link(), bb_get_post_time()); else printf(__('User last replied: <a href="%1$s">%2$s ago</a>'), get_post_link(), bb_get_post_time()); ?> |
+<div id="user-replies" class="user-recent">
+	<?php do_action( 'bb_topics_above_table_before_heading', 'profile-user-recent-replies' /* type */, $posts ); ?>
+	<?php if ( $posts ) : ?>
+	<h4><?php _e( 'Recent Replies' ); ?></h4>
+	<?php do_action( 'bb_topics_above_table', 'profile-user-recent-replies' /* type */, $posts ); ?>
+	<table id="latest">
+		<thead>
+			<tr>
+				<th><?php _e( 'Topic' ); ?></th>
+				<th class="date"><?php if ( $user->ID == bb_get_current_user_info( 'id' ) ) _e( 'You Last Replied' ); else _e( 'User Last Replied' ); ?></th>
+				<th class="date"><?php _e( 'Most Recent Reply' ); ?></th>
+				<?php do_action( 'bb_topics_thead', 'profile-user-recent-replies' /* type */, $posts ); ?>
+			</tr>
+		</thead>
+		<tbody>
+			<?php foreach ( $posts as $bb_post ) : $topic = get_topic( $bb_post->topic_id ); ?>
+			<tr<?php alt_class( 'replies' ); ?>>
+				<td><?php bb_topic_labels(); ?> <a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></td>
+				<td class="date"><a href="<?php post_link(); ?>"><?php bb_post_time(); ?> <?php _e( 'ago' ); ?></a></td>
+				<td class="date">
+					<?php if ( bb_get_post_time( 'timestamp' ) < get_topic_time( 'timestamp' ) ) { ?>
+					<a href="<?php topic_last_post_link(); ?>"><?php topic_time(); ?> <?php _e( 'ago' ); ?></a>
+					<?php } else { ?> - <?php } ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
 
-	<span class="freshness"><?php
-		if ( bb_get_post_time( 'timestamp' ) < get_topic_time( 'timestamp' ) )
-			printf(__('Most recent reply: <a href="%1$s">%2$s ago</a>'), get_topic_last_post_link(),  get_topic_time());
-		else
-			_e('No replies since');
-	?></span>
-</li>
-<?php endforeach; ?>
-</ol>
-<?php else : if ( $page ) : ?>
-<p><?php _e('No more replies.') ?></p>
-<?php else : ?>
-<p><?php _e('No replies yet.') ?></p>
-<?php endif; endif; ?>
+	<?php else : if ( $page ) : ?>
+	<p><?php _e( 'No more replies.' ); ?></p>
+	<?php else : ?>
+	<p><?php _e( 'No replies yet.' ) ?></p>
+	<?php endif; endif; ?>
+	
 </div>
 
 <div id="user-threads" class="user-recent">
-<h4><?php _e('Topics Started') ?></h4>
-<?php if ( $topics ) : ?>
-<ol>
-<?php foreach ($topics as $topic) : ?>
-<li<?php alt_class('topics'); ?>>
-	<a href="<?php topic_link(); ?>"><?php topic_title(); ?></a> -
-	<?php printf(__('Started: %s ago'), get_topic_start_time()); ?> |
+	<h4><?php _e( 'Topics Started' ); ?></h4>
+	<?php if ( $topics ) : ?>
+	<table id="latest">
+		<thead>
+			<tr>
+				<th><?php _e( 'Topic' ); ?></th>
+				<th class="date"><?php _e( 'Started' ); ?></th>
+				<th class="date"><?php _e( 'Most Recent Reply' ); ?></th>
+			</tr>
+		</thead>
+		<tbody>
+			<?php foreach ( $topics as $topic ) : ; ?>
+			<tr<?php alt_class( 'topics' ); ?>>
+				<td><?php bb_topic_labels(); ?> <a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></td>
+				<td class="date"><?php topic_start_time(); ?></td>
+				<td class="date">
+					<?php if ( get_topic_start_time( 'timestamp' ) < get_topic_time( 'timestamp' ) ) { ?>
+					<a href="<?php topic_last_post_link(); ?>"><?php topic_time(); ?> <?php _e( 'ago' ); ?></a>
+					<?php } else { ?> - <?php } ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
 
-	<span class="freshness"><?php
-		if ( get_topic_start_time( 'timestamp' ) < get_topic_time( 'timestamp' ) )
-			printf(__('Most recent reply: <a href="%1$s">%2$s ago</a>'), get_topic_last_post_link(), get_topic_time());
-		else
-			_e('No replies since');
-	?></span>
-</li>
-<?php endforeach; ?>
-</ol>
-<?php else : if ( $page ) : ?>
-<p><?php _e('No more topics posted.') ?></p>
-<?php else : ?>
-<p><?php _e('No topics posted yet.') ?></p>
-<?php endif; endif;?>
+	<?php else : if ( $page ) : ?>
+	<p><?php _e( 'No more topics posted.' ); ?></p>
+	<?php else : ?>
+	<p><?php _e( 'No topics posted yet.' ); ?></p>
+	<?php endif; endif;?>
+	
 </div>
 
 <?php profile_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/register-success.php
===================================================================
--- bb-templates/kakumei/register-success.php	(revision 2442)
+++ bb-templates/kakumei/register-success.php	(working copy)
@@ -1,9 +1,7 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Register'); ?></div>
+<h2 id="register" role="main"><?php _e( 'Great!' ); ?></h2>
 
-<h2 id="register" role="main"><?php _e('Great!'); ?></h2>
+<p><?php printf( __( 'Your registration as <strong>%1$s</strong> was successful. Within a few minutes you should receive an email with your password. You may now <a href="%2$s">go back</a> to the forums.' ), $user_login, bb_get_uri() ); ?></p>
 
-<p><?php printf(__('Your registration as <strong>%s</strong> was successful. Within a few minutes you should receive an email with your password.'), $user_login) ?></p>
-
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/register.php
===================================================================
--- bb-templates/kakumei/register.php	(revision 2442)
+++ bb-templates/kakumei/register.php	(working copy)
@@ -1,83 +1,68 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Register'); ?></div>
+<h2 id="register" role="main"><?php _e( 'Registration' ); ?></h2>
 
-<h2 id="register" role="main"><?php _e('Registration'); ?></h2>
-
 <?php if ( !bb_is_user_logged_in() ) : ?>
 
-<form method="post" action="<?php bb_uri('register.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_USER_FORMS); ?>">
+<form method="post" action="<?php bb_uri( 'register.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_USER_FORMS ); ?>">
 
-<fieldset>
-<legend><?php _e('Profile Information'); ?></legend>
-
-<p><?php _e("Your password will be emailed to the address you provide."); ?></p>
-
+	<fieldset>
+		<legend><?php _e( 'Profile Information' ); ?></legend>
+		
+		<p><?php _e( 'Your password will be emailed to the address you provide.' ); ?></p>
+		
+		<?php $user_login_error = $bb_register_error->get_error_message( 'user_login' ); ?>
+		
+		<table width="100%">
+			<tr class="form-field form-required required<?php if ( $user_login_error ) echo ' form-invalid error'; ?>">
+				<th scope="row">
+					<label for="user_login"><?php _e( 'Username' ); ?></label>
+					<?php if ( $user_login_error ) echo "<em>$user_login_error</em>"; ?>
+				</th>
+				<td>
+					<input name="user_login" type="text" id="user_login" size="30" maxlength="30" value="<?php echo $user_login; ?>"<?php bb_tabindex(); ?> />
+				</td>
+			</tr>
 <?php
-
-$user_login_error = $bb_register_error->get_error_message( 'user_login' );
-
-?>
-
-<table width="100%">
-	<tr class="form-field form-required required<?php if ( $user_login_error ) echo ' form-invalid error'; ?>">
-		<th scope="row">
-			<label for="user_login"><?php _e('Username'); ?></label>
-			<?php if ( $user_login_error ) echo "<em>$user_login_error</em>"; ?>
-		</th>
-		<td>
-			<input name="user_login" type="text" id="user_login" size="30" maxlength="30" value="<?php echo $user_login; ?>" />
-		</td>
-	</tr>
-
-<?php
-
-if ( is_array($profile_info_keys) ) :
+if ( is_array( $profile_info_keys ) ) :
 	foreach ( $profile_info_keys as $key => $label ) :
 		$class = 'form-field';
-		if ( $label[0] ) {
+		if ( $label[0] )
 			$class .= ' form-required required';
-		}
 		if ( $profile_info_key_error = $bb_register_error->get_error_message( $key ) )
 			$class .= ' form-invalid error';
-
 ?>
-
-	<tr class="<?php echo $class; ?>">
-		<th scope="row">
-			<label for="<?php echo $key; ?>"><?php echo $label[1]; ?></label>
-			<?php if ( $profile_info_key_error ) echo "<em>$profile_info_key_error</em>"; ?>
-		</th>
-		<td>
-			<input name="<?php echo $key; ?>" type="text" id="<?php echo $key; ?>" size="30" maxlength="140" value="<?php echo $$key; ?>" />
-		</td>
-	</tr>
-
+			<tr class="<?php echo $class; ?>">
+				<th scope="row">
+					<label for="<?php echo $key; ?>"><?php echo $label[1]; ?></label>
+					<?php if ( $profile_info_key_error ) echo "<em>$profile_info_key_error</em>"; ?>
+				</th>
+				<td>
+					<input name="<?php echo $key; ?>" type="text" id="<?php echo $key; ?>" size="30" maxlength="140" value="<?php echo $$key; ?>"<?php bb_tabindex(); ?> />
+				</td>
+			</tr>
 <?php
-
 	endforeach; // profile_info_keys
 endif; // profile_info_keys
-
 ?>
 
-</table>
+		</table>
+		<p class="required-message"><?php _e( 'These items are <span class="required">required</span>.' ) ?></p>
+		
+	</fieldset>
 
-<p class="required-message"><?php _e('These items are <span class="required">required</span>.') ?></p>
+	<?php do_action( 'extra_profile_info', $user ); ?>
 
-</fieldset>
+	<p class="submit">
+		<input type="submit" name="Submit" value="<?php esc_attr_e( 'Register &raquo;' ); ?>"<?php bb_tabindex(); ?> />
+	</p>
 
-<?php do_action('extra_profile_info', $user); ?>
-
-<p class="submit">
-	<input type="submit" name="Submit" value="<?php echo esc_attr__( 'Register &raquo;' ); ?>" />
-</p>
-
 </form>
 
 <?php else : ?>
 
-<p><?php _e('You&#8217;re already logged in, why do you need to register?'); ?></p>
+<p><?php _e( 'You are already logged in, why do you need to register?' ); ?></p>
 
 <?php endif; ?>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/rss2.php
===================================================================
--- bb-templates/kakumei/rss2.php	(revision 2442)
+++ bb-templates/kakumei/rss2.php	(working copy)
@@ -32,4 +32,4 @@
 <?php endforeach; ?>
 
 	</channel>
-</rss>
+</rss>
\ No newline at end of file
Index: bb-templates/kakumei/search-form.php
===================================================================
--- bb-templates/kakumei/search-form.php	(revision 2442)
+++ bb-templates/kakumei/search-form.php	(working copy)
@@ -1,7 +1,7 @@
-<form class="search-form" role="search" action="<?php bb_uri('search.php', null, BB_URI_CONTEXT_FORM_ACTION); ?>" method="get">
+<form class="search-form" role="search" action="<?php bb_uri( 'search.php', null, BB_URI_CONTEXT_FORM_ACTION ); ?>" method="get">
 	<p>
-		<label class="hidden" for="q"><?php _e('Search:'); ?></label>
-		<input class="text" type="text" size="14" maxlength="100" name="q" id="q" />
-		<input class="submit" type="submit" value="<?php echo esc_attr__( 'Search &raquo;' ); ?>" />
+		<label class="hidden" for="q"><?php _e( 'Search:' ); ?></label>
+		<input class="text" type="text" size="14" maxlength="100" name="q" id="q"<?php bb_tabindex(); ?> />
+		<input class="submit" type="submit" value="<?php esc_attr_e( 'Search &raquo;' ); ?>"<?php bb_tabindex(); ?> />
 	</p>
-</form>
+</form>
\ No newline at end of file
Index: bb-templates/kakumei/search.php
===================================================================
--- bb-templates/kakumei/search.php	(revision 2442)
+++ bb-templates/kakumei/search.php	(working copy)
@@ -1,6 +1,5 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Search')?></div>
 <?php bb_topic_search_form(); ?>
 
 <?php if ( !empty ( $q ) ) : ?>
Index: bb-templates/kakumei/stats.php
===================================================================
--- bb-templates/kakumei/stats.php	(revision 2442)
+++ bb-templates/kakumei/stats.php	(working copy)
@@ -1,10 +1,15 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option( 'name' ); ?></a> &raquo; <?php _e( 'Statistics' ); ?></div>
-
 <dl role="main" class="left">
 	<dt><?php _e( 'Registered Users' ); ?></dt>
 	<dd><strong><?php bb_total_users(); ?></strong></dd>
+	
+	<dt><?php _e( 'Forums' ); ?></dt>
+	<dd><strong><?php total_forums(); ?></strong></dd>
+	
+	<dt><?php _e( 'Topics' ); ?></dt>
+	<dd><strong><?php total_topics(); ?></strong></dd>
+	
 	<dt><?php _e( 'Posts' ); ?></dt>
 	<dd><strong><?php total_posts(); ?></strong></dd>
 <?php do_action( 'bb_stats_left' ); ?>
@@ -23,4 +28,4 @@
 <?php do_action( 'bb_stats_right' ); ?>
 </div>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/style.css
===================================================================
--- bb-templates/kakumei/style.css	(revision 2442)
+++ bb-templates/kakumei/style.css	(working copy)
@@ -31,6 +31,8 @@
 
 .right { float: right; }
 
+.clear { clear:both; }
+
 .delete:hover {
 	background-color: #c00;
 	color: #fff;
@@ -282,7 +284,7 @@
 /* Front Page
 =================================== */
 
-#front-page #hottags {
+#sidebar {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -290,6 +292,14 @@
 	overflow: hidden;
 }
 
+ul#views { list-style: none; }
+
+ul#views li { padding: 2px 3px; }
+
+ul#views li.alt { background-color: #F7F7F7; }
+
+ul#views li:hover { background-color: #E4F3E1; }
+
 #front-page #discussions {
 	margin-left: 170px;
 	width: 590px;
@@ -729,10 +739,6 @@
 	width: 100%;
 }
 
-#latest, #forumlist {
-	margin-top: -0.9em;
-}
-
 #discussions .nav {
 	margin-top: -2em;
 	margin-bottom: 1em;
@@ -778,7 +784,7 @@
 	background-color: #e4f3e1;
 }
 
-#useravatar { margin-bottom: 1em; }
+#useravatar { margin: 0 1em 1em 0; float: left; }
 
 #useravatar img { display: block; border-width: 3px; border-style: double; }
 
@@ -786,16 +792,14 @@
 
 #userinfo dt { font-weight: bold; }
 
-#userinfo dd { margin: 0 0 5px; } 
+#userinfo dd { margin: 0 0 5px 10px; } 
 
 #useractivity { margin: 15px 0 5px; }
 
 .user-recent { margin: 0 0 10px; }
 
-.user-recent ol { margin: 5px 0 0 28px; }
+.user-recent td.date, .user-recent th.date { width: 150px; text-align: center !important; }
 
-.user-recent ol li { margin: 0 0 3px; }
-
 /* Search
 =================================== */
 
Index: bb-templates/kakumei/tag-single.php
===================================================================
--- bb-templates/kakumei/tag-single.php	(revision 2442)
+++ bb-templates/kakumei/tag-single.php	(working copy)
@@ -1,41 +1,15 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <a href="<?php bb_tag_page_link(); ?>"><?php _e('Tags'); ?></a> &raquo; <?php bb_tag_name(); ?></div>
+<?php do_action( 'tag_above_table' ); /* DEPRECATED, use the one in functions.php */ ?>
 
-<?php do_action('tag_above_table'); ?>
+<?php bb_kakumei_topics_table(); ?>
 
-<?php if ( $topics ) : ?>
+<p class="rss-link"><a href="<?php bb_tag_posts_rss_link(); ?>" class="rss-link"><?php _e( '<abbr title="Really Simple Syndication">RSS</abbr> link for this tag' ); ?></a></p>
 
-<table id="latest" role="main">
-<tr>
-	<th><?php _e('Topic'); ?> &#8212; <?php bb_new_topic_link(); ?></th>
-	<th><?php _e('Posts'); ?></th>
-	<!-- <th><?php _e('Voices'); ?></th> -->
-	<th><?php _e('Last Poster'); ?></th>
-	<th><?php _e('Freshness'); ?></th>
-</tr>
-
-<?php foreach ( $topics as $topic ) : ?>
-<tr<?php topic_class(); ?>>
-	<td><?php bb_topic_labels(); ?> <a href="<?php topic_link(); ?>"><?php topic_title(); ?></a><?php topic_page_links(); ?></td>
-	<td class="num"><?php topic_posts(); ?></td>
-	<!-- <td class="num"><?php bb_topic_voices(); ?></td> -->
-	<td class="num"><?php topic_last_poster(); ?></td>
-	<td class="num"><a href="<?php topic_last_post_link(); ?>" title="<?php topic_time(array('format'=>'datetime')); ?>"><?php topic_time(); ?></a></td>
-</tr>
-<?php endforeach; ?>
-</table>
-
-<p class="rss-link"><a href="<?php bb_tag_posts_rss_link(); ?>" class="rss-link"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> link for this tag') ?></a></p>
-
-<?php tag_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?>
-
-<?php endif; ?>
-
 <?php post_form(); ?>
 
-<?php do_action('tag_below_table'); ?>
+<?php do_action( 'tag_below_table' ); /* DEPRECATED, use the one in functions.php */ ?>
 
 <?php manage_tags_forms(); ?>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/tags.php
===================================================================
--- bb-templates/kakumei/tags.php	(revision 2442)
+++ bb-templates/kakumei/tags.php	(working copy)
@@ -1,11 +1,9 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Tags'); ?></div>
+<p role="main"><?php _e( 'This is a collection of tags that are currently popular on the forums.' ); ?></p>
 
-<p role="main"><?php _e('This is a collection of tags that are currently popular on the forums.'); ?></p>
-
 <div id="hottags">
-<?php bb_tag_heat_map( 9, 38, 'pt', 80 ); ?>
+	<?php bb_tag_heat_map( 9, 38, 'pt', 80 ); ?>
 </div>
 
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/topic-tags.php
===================================================================
--- bb-templates/kakumei/topic-tags.php	(revision 2442)
+++ bb-templates/kakumei/topic-tags.php	(working copy)
@@ -1,16 +1,12 @@
-<div id="topic-tags">
-<p><?php _e('Tags:'); ?></p>
-
+	<div id="topic-tags">
+		<p><?php _e( 'Tags:' ); ?></p>
+		
 <?php if ( bb_get_topic_tags() ) : ?>
-
-<?php bb_list_tags(); ?>
-
+		<?php bb_list_tags(); ?>
 <?php else : ?>
-
-<p><?php printf(__('No <a href="%s">tags</a> yet.'), bb_get_tag_page_link() ); ?></p>
-
+		<p><?php printf( __( 'No <a href="%s">tags</a> yet.' ), bb_get_tag_page_link() ); ?></p>
 <?php endif; ?>
 
 <?php tag_form(); ?>
 
-</div>
+	</div>
\ No newline at end of file
Index: bb-templates/kakumei/topic.php
===================================================================
--- bb-templates/kakumei/topic.php	(revision 2442)
+++ bb-templates/kakumei/topic.php	(working copy)
@@ -1,53 +1,60 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a><?php bb_forum_bread_crumb(); ?></div>
 <div class="infobox" role="main">
 
 <div id="topic-info">
-<span id="topic_labels"><?php bb_topic_labels(); ?></span>
-<h2<?php topic_class( 'topictitle' ); ?>><?php topic_title(); ?></h2>
-<span id="topic_posts">(<?php topic_posts_link(); ?>)</span>
-<span id="topic_voices">(<?php printf( _n( '%s voice', '%s voices', bb_get_topic_voices() ), bb_get_topic_voices() ); ?>)</span>
-
-<ul class="topicmeta">
-	<li><?php printf(__('Started %1$s ago by %2$s'), get_topic_start_time(), get_topic_author()) ?></li>
+	<span id="topic_labels"><?php bb_topic_labels(); ?></span>
+	<h2<?php topic_class( 'topictitle' ); ?>><?php topic_title(); ?></h2>
+	
+	<ul class="topicmeta">
+		<li><?php printf( '%1$s and %2$s', get_topic_posts_link(), sprintf( _n( '%s voice', '%s voices', bb_get_topic_voices() ), bb_get_topic_voices() ) ); ?></li>
+		<li><?php printf( __( 'Started %1$s ago by %2$s' ), get_topic_start_time(), get_topic_author() ); ?></li>
 <?php if ( 1 < get_topic_posts() ) : ?>
-	<li><?php printf(__('<a href="%1$s">Latest reply</a> from %2$s'), esc_attr( get_topic_last_post_link() ), get_topic_last_poster()) ?></li>
-<?php endif; ?>
-<?php if ( bb_is_user_logged_in() ) : ?>
-	<li<?php echo $class;?> id="favorite-toggle"><?php user_favorites_link(); ?></li>
-	<li id="subscribe-toggle"><?php bb_user_subscribe_link(); ?></li>
-<?php endif; do_action('topicmeta'); ?>
-</ul>
+		<li><?php printf( __( '<a href="%1$s">Last reply</a> by %2$s' ), esc_attr( get_topic_last_post_link() ), get_topic_last_poster() ); ?></li>
+<?php endif; if ( bb_is_user_logged_in() ) : ?>
+		<li<?php echo $class;?> id="favorite-toggle"><?php user_favorites_link(); ?></li>
+		<li id="subscribe-toggle"><?php bb_user_subscribe_link(); ?></li>
+<?php endif; do_action( 'topicmeta' ); ?>
+	</ul>
 </div>
 
 <?php topic_tags(); ?>
 
-<div style="clear:both;"></div>
+	<div class="clear"></div>
 </div>
-<?php do_action('under_title'); ?>
-<?php if ($posts) : ?>
+
+<?php do_action( 'under_title' ); ?>
+
+<?php if ( $posts ) : ?>
 <?php topic_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?>
 <div id="ajax-response"></div>
+
 <ol id="thread" class="list:post">
 
-<?php foreach ($posts as $bb_post) : $del_class = post_del_class(); ?>
-	<li id="post-<?php post_id(); ?>"<?php alt_class('post', $del_class); ?>>
+<?php foreach ( $posts as $bb_post ) : $del_class = post_del_class(); ?>
+	<li id="post-<?php post_id(); ?>"<?php alt_class( 'post', $del_class ); ?>>
 <?php bb_post_template(); ?>
 	</li>
 <?php endforeach; ?>
 
 </ol>
-<div class="clearit"><br style=" clear: both;" /></div>
-<p class="rss-link"><a href="<?php topic_rss_link(); ?>" class="rss-link"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for this topic') ?></a></p>
+
+<div class="clear"></div><br />
+
+<p class="rss-link"><a href="<?php topic_rss_link(); ?>" class="rss-link"><?php _e( '<abbr title="Really Simple Syndication">RSS</abbr> feed for this topic' ); ?></a></p>
+
 <?php topic_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?>
 <?php endif; ?>
+
 <?php if ( topic_is_open( $bb_post->topic_id ) ) : ?>
 <?php post_form(); ?>
 <?php else : ?>
-<h2><?php _e('Topic Closed') ?></h2>
-<p><?php _e('This topic has been closed to new replies.') ?></p>
+
+<h2><?php _e( 'Topic Closed' ) ?></h2>
+<p><?php _e( 'This topic has been closed to new replies.' ) ?></p>
+
 <?php endif; ?>
+
 <?php if ( bb_current_user_can( 'delete_topic', get_topic_id() ) || bb_current_user_can( 'close_topic', get_topic_id() ) || bb_current_user_can( 'stick_topic', get_topic_id() ) || bb_current_user_can( 'move_topic', get_topic_id() ) ) : ?>
 
 <div class="admin">
@@ -55,4 +62,4 @@
 </div>
 
 <?php endif; ?>
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file
Index: bb-templates/kakumei/view.php
===================================================================
--- bb-templates/kakumei/view.php	(revision 2442)
+++ bb-templates/kakumei/view.php	(working copy)
@@ -1,44 +1,7 @@
 <?php bb_get_header(); ?>
 
-<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <?php view_name(); ?></div>
+<?php bb_kakumei_topics_table(); ?>
 
-<?php if ( $topics || $stickies ) : ?>
+<p class="rss-link"><a href="<?php bb_view_rss_link(); ?>" class="rss-link"><?php _e( '<abbr title="Really Simple Syndication">RSS</abbr> feed for this view' ); ?></a></p>
 
-<table id="latest" role="main">
-<tr>
-	<th><?php _e('Topic'); ?></th>
-	<th><?php _e('Posts'); ?></th>
-	<!-- <th><?php _e('Voices'); ?></th> -->
-	<th><?php _e('Last Poster'); ?></th>
-	<th><?php _e('Freshness'); ?></th>
-</tr>
-
-<?php if ( $stickies ) : foreach ( $stickies as $topic ) : ?>
-<tr<?php topic_class(); ?>>
-	<td><?php bb_topic_labels(); ?> <big><a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></big></td>
-	<td class="num"><?php topic_posts(); ?></td>
-	<!-- <td class="num"><?php bb_topic_voices(); ?></td> -->
-	<td class="num"><?php topic_last_poster(); ?></td>
-	<td class="num"><a href="<?php topic_last_post_link(); ?>" title="<?php topic_time(array('format'=>'datetime')); ?>"><?php topic_time(); ?></a></td>
-</tr>
-<?php endforeach; endif; ?>
-
-<?php if ( $topics ) : foreach ( $topics as $topic ) : ?>
-<tr<?php topic_class(); ?>>
-	<td><?php bb_topic_labels(); ?> <a href="<?php topic_link(); ?>"><?php topic_title(); ?></a><?php topic_page_links(); ?></td>
-	<td class="num"><?php topic_posts(); ?></td>
-	<!-- <td class="num"><?php bb_topic_voices(); ?></td> -->
-	<td class="num"><?php topic_last_poster(); ?></td>
-	<td class="num"><a href="<?php topic_last_post_link(); ?>" title="<?php topic_time(array('format'=>'datetime')); ?>"><?php topic_time(); ?></a></td>
-</tr>
-<?php endforeach; endif; ?>
-</table>
-
-<p class="rss-link"><a href="<?php bb_view_rss_link(); ?>" class="rss-link"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for this view'); ?></a></p>
-
-<div class="nav">
-<?php view_pages(); ?>
-</div>
-<?php endif; ?>
-
-<?php bb_get_footer(); ?>
+<?php bb_get_footer(); ?>
\ No newline at end of file

