diff --git a/wp-content/themes/twentyeleven/colors/dark.css b/wp-content/themes/twentyeleven/colors/dark.css
index 5020f5760..8bb86d053 100644
--- a/wp-content/themes/twentyeleven/colors/dark.css
+++ b/wp-content/themes/twentyeleven/colors/dark.css
@@ -41,10 +41,12 @@ textarea {
 input[type=text]:focus,
 textarea:focus {
 }
+input#s {
+	background-color: #ddd;
+}
 
 /* Links */
 a {
-	color: #e4741f;
 }
 
 
@@ -52,7 +54,7 @@ a {
 ----------------------------------------------- */
 
 #branding {
-	border-top: 2px solid #444;
+	border-top: 2px solid #0a0a0a;
 }
 #site-title a {
 	color: #eee;
@@ -60,7 +62,6 @@ a {
 #site-title a:hover,
 #site-title a:focus,
 #site-title a:active {
-	color: #e4741f;
 }
 #site-description {
 	color: #858585;
@@ -100,7 +101,6 @@ a {
 .entry-title a:hover,
 .entry-title a:focus,
 .entry-title a:active {
-	color: #e4741f;
 }
 .entry-meta {
 	color: #999;
@@ -166,16 +166,12 @@ a {
 
 /* Comments link */
 .entry-header .comments-link a {
-	background: #111;
+	background: #1a1a1a;
 	border-color: #222;
 	color: #888;
 }
-.entry-header .comments-link a:hover,
-.entry-header .comments-link a:focus,
-.entry-header .comments-link a:active {
-	background: #888;
-	border-color: #aaa;
-	color: #000;
+.entry-header .comments-link a .leave-reply {
+	background-position-y: -24px;
 }
 
 /* Singular content styles for Posts and Pages */
@@ -205,6 +201,17 @@ a {
 }
 
 
+/* =Image
+----------------------------------------------- */
+
+.format-image .entry-meta .edit-link a {
+	color: #ddd;
+}
+.format-image .entry-meta .edit-link a:hover {
+	color: #fff;
+}
+
+
 /* =error404
 ----------------------------------------------- */
 .error404 #main #searchform {
@@ -255,7 +262,6 @@ article.feature-image.small .entry-summary p a {
 	color: #111;
 }
 article.feature-image.small .entry-summary p a:hover {
-	background: #e4741f;
 	color: #40220c;
 }
 
@@ -308,7 +314,6 @@ section.recent-posts .other-recent-posts a[rel="bookmark"] {
 	color: #ccc;
 }
 section.recent-posts .other-recent-posts a[rel="bookmark"]:hover {
-	color: #e4741f;
 }
 section.recent-posts .other-recent-posts .comments-link a,
 section.recent-posts .other-recent-posts .comments-link > span {
@@ -320,8 +325,6 @@ section.recent-posts .other-recent-posts .comments-link > span {
 	color: #777;
 }
 section.recent-posts .other-recent-posts .comments-link a:hover {
-	color: #e4741f;
-	border-color: #e4741f;
 }
 
 
@@ -368,8 +371,6 @@ section.recent-posts .other-recent-posts .comments-link a:hover {
 	color: #777;
 }
 .widget_search #searchsubmit:active {
-	background: #e4741f;
-	border-color: #f79e5a;
 	-webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
 	-moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
 	box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
@@ -484,7 +485,6 @@ section.recent-posts .other-recent-posts .comments-link a:hover {
 	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
 }
 #respond input#submit:active {
-	background: #e4741f;
 	color: #40220c;
 }
 #respond #cancel-comment-reply-link {
@@ -513,7 +513,7 @@ section.recent-posts .other-recent-posts .comments-link a:hover {
 /* Site Generator Line */
 #site-generator {
 	background: #060606;
-	border-color: #222;
+	border-color: #000;
 }
 
 
diff --git a/wp-content/themes/twentyeleven/content-single.php b/wp-content/themes/twentyeleven/content-single.php
index 1311aa927..7900c7434 100644
--- a/wp-content/themes/twentyeleven/content-single.php
+++ b/wp-content/themes/twentyeleven/content-single.php
@@ -53,7 +53,7 @@
 		?>
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 
-		<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
+		<?php if ( get_the_author_meta( 'description' ) && is_multi_author() ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
 		<div id="author-info">
 			<div id="author-avatar">
 				<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyeleven_author_bio_avatar_size', 68 ) ); ?>
diff --git a/wp-content/themes/twentyeleven/image.php b/wp-content/themes/twentyeleven/image.php
index d89b7a380..f5bce65ff 100644
--- a/wp-content/themes/twentyeleven/image.php
+++ b/wp-content/themes/twentyeleven/image.php
@@ -36,7 +36,7 @@ get_header(); ?>
 									get_the_title( $post->post_parent )
 								);
 							?>
-							<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="sep">|</span> <span class="edit-link">', '</span>' ); ?>
+							<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 						</div><!-- .entry-meta -->
 
 					</header><!-- .entry-header -->
diff --git a/wp-content/themes/twentyeleven/images/icon-comment.png b/wp-content/themes/twentyeleven/images/icon-comment.png
new file mode 100644
index 000000000..b97b44f01
Binary files /dev/null and b/wp-content/themes/twentyeleven/images/icon-comment.png differ
diff --git a/wp-content/themes/twentyeleven/inc/theme-options.php b/wp-content/themes/twentyeleven/inc/theme-options.php
index 213048d14..8e8e49127 100644
--- a/wp-content/themes/twentyeleven/inc/theme-options.php
+++ b/wp-content/themes/twentyeleven/inc/theme-options.php
@@ -327,9 +327,12 @@ function twentyeleven_print_link_color_style() {
 		section.recent-posts .other-recent-posts .comments-link a:hover {
 			border-color: <?php echo $link_color; ?>;
 		}	
-		article.feature-image.small .entry-summary p a:hover {
+		article.feature-image.small .entry-summary p a:hover,
+		.entry-header .comments-link a:hover,
+		.entry-header .comments-link a:focus,
+		.entry-header .comments-link a:active {
 			background: <?php echo $link_color; ?>;
-		}	
+		}
 	</style>
 <?php
 }
diff --git a/wp-content/themes/twentyeleven/sidebar.php b/wp-content/themes/twentyeleven/sidebar.php
index f1f4f378f..cbb5fa8b8 100644
--- a/wp-content/themes/twentyeleven/sidebar.php
+++ b/wp-content/themes/twentyeleven/sidebar.php
@@ -6,6 +6,11 @@
  * @subpackage Twenty_Eleven
  * @since Twenty Eleven 1.0
  */
+
+$options = twentyeleven_get_theme_options();
+$current_layout = $options['theme_layout'];
+
+if ( 'content' != $current_layout ) :
 ?>
 		<div id="secondary" class="widget-area" role="complementary">
 			<?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
@@ -28,3 +33,4 @@
 
 			<?php endif; // end sidebar widget area ?>
 		</div><!-- #secondary .widget-area -->
+<?php endif; ?>
\ No newline at end of file
diff --git a/wp-content/themes/twentyeleven/style.css b/wp-content/themes/twentyeleven/style.css
index 20860b1af..9ccc42d82 100644
--- a/wp-content/themes/twentyeleven/style.css
+++ b/wp-content/themes/twentyeleven/style.css
@@ -424,6 +424,8 @@ sup {
 sub {
 	top: .5ex;
 }
+
+/* Forms */
 input[type=text],
 textarea {
 	background: #fafafa;
@@ -444,6 +446,18 @@ textarea {
 input[type=text] {
 	padding: 3px;
 }
+input#s {
+	background: url(images/search.png) no-repeat 5px 6px;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	font-size: 14px;
+	height: 22px;
+	line-height: 1.2em;
+	padding: 4px 10px 4px 28px;
+}
+input#searchsubmit {
+	display: none;
+}
 
 /* Links */
 a {
@@ -595,14 +609,7 @@ a:hover {
 	margin: 0;
 }
 #branding #s {
-	background: url(images/search.png) no-repeat 5px 6px;
-	-moz-border-radius: 2px;
-	border-radius: 2px;
 	float: right;
-	font-size: 14px;
-	height: 22px;
-	line-height: 1.2em;
-	padding: 4px 10px 4px 28px;
 	-webkit-transition-duration: 400ms;
 	-webkit-transition-property: width, background;
 	-webkit-transition-timing-function: ease;
@@ -665,13 +672,15 @@ a:hover {
 	letter-spacing: 0;
 	text-transform: none;
 }
-.hentry {
+.hentry,
+.no-results {
 	border-bottom: 1px solid #ddd;
 	margin: 0 0 1.625em;
 	padding: 0 0 1.625em;
 	position: relative;
 }
-.hentry:last-child {
+.hentry:last-child,
+.no-results {
 	border-bottom: none;
 }
 .blog .sticky .entry-header .entry-meta {
@@ -750,6 +759,9 @@ a:hover {
 	border-top: 1px solid #ddd;
 	padding: 6px 10px 6px 0;
 }
+.entry-content #s {
+	width: 75%;
+}
 .comment-content ul,
 .comment-content ol {
 	margin-bottom: 1.625em;
@@ -863,7 +875,7 @@ dl.gallery-item {
 	position: absolute;
 	text-align: center;
 	text-decoration: none;
-	top: 0;
+	top: .5em;
 	right: 0;
 	width: 48px;
 	height: 48px;
@@ -871,16 +883,27 @@ dl.gallery-item {
 .entry-header .comments-link a:hover,
 .entry-header .comments-link a:focus,
 .entry-header .comments-link a:active {
-	background: #777;
-	border-color: #555;
+	background: #1b8be0;
+	border-color: #1573bb;
+	border-color: rgba(0,0,0,0.2);
 	color: #fff;
+	color: rgba(255,255,255,0.8);
 }
 .entry-header .comments-link .leave-reply {
-	font-size: 14px;
-	font-weight: bold;
+	background: url(images/icon-comment.png) no-repeat;
+	color: transparent;
+	display: inline-block;
+	font-family: "Arial Unicode MS", "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 26px;
+	height: 24px;
+	line-height: 12px;
+	opacity: 0.25;
 	position: relative;
-	text-transform: lowercase;
-	top: -1px;
+	width: 24px;
+}
+.entry-header .comments-link a:hover .leave-reply {
+	background-position-y: -24px;
+	opacity: 0.5;
 }
 /*
 	Post Formats Headings
@@ -936,15 +959,29 @@ article.format-status .entry-content {
 	top: 0;
 	left: 0;
 }
-.singular blockquote.pull {
+blockquote.pull {
 	font-size: 21px;
 	font-weight: bold;
 	line-height: 1.6125em;
+	margin: 0 0 1.625em;
+	text-align: center;
+}
+.singular blockquote.pull {
 	margin: 0 -22.25% 1.625em;
 }
+.pull.alignleft {
+	margin: 0 1.625em 0 0;
+	text-align: right;
+	width: 33%;
+}
 .singular .pull.alignleft {
 	margin: 0 1.625em 0 -22.25%;
 }
+.pull.alignright {
+	margin: 0 0 0 1.625em;
+	text-align: left;
+	width: 33%;
+}
 .singular .pull.alignright {
 	margin: 0 -22.25% 0 1.625em;
 }
@@ -1246,7 +1283,7 @@ article.feature-image.small .entry-summary p a:hover {
 /* Large featured post */
 section.feature-image.large {
 	border: none;
-	max-height: 300px;
+	max-height: 288px;
 	padding: 0;
 	width: 100%;
 }
@@ -1290,7 +1327,7 @@ section.feature-image.large img {
 .featured-posts {
 	border-bottom: 1px solid #e8e8e8;
 	display: block;
-	height: 340px;
+	height: 328px;
 	margin: 1.625em -8.9% 20px;
 	max-width: 1000px;
 	padding: 0;
@@ -1301,7 +1338,7 @@ section.feature-image.large img {
 }
 .featured-posts section.featured-post {
 	background: #fff;
-	height: 300px;
+	height: 288px;
 	left: 0;
 	margin: 0;
 	position: absolute;
@@ -1309,6 +1346,7 @@ section.feature-image.large img {
 	width: auto;
 }
 .featured-posts section.featured-post.large {
+	max-width: 100%;
 	overflow: hidden;
 }
 .featured-posts section.featured-post {
@@ -1503,6 +1541,9 @@ p img,
 	left: 10px;
 	top: 7px;
 }
+.gallery {
+	margin: 0 auto 1.625em !important;
+}
 .gallery-caption {
 }
 img#wpstats {
@@ -1527,6 +1568,12 @@ img#wpstats {
 #nav-above {
 	padding: 0 0 1.625em;
 }
+#nav-above {
+	display: none;
+}
+.paged #nav-above {
+	display: block;
+}
 .nav-previous {
 	float: left;
 	width: 50%;
@@ -1598,7 +1645,7 @@ img#wpstats {
 	margin: 0 0 1.625em;
 }
 .widget_search #s {
-	width: 58%;
+	width: 77%;
 }
 .widget_search #searchsubmit {
 	background: #ddd;
@@ -2076,7 +2123,10 @@ p.comment-form-comment {
 	}
 	/* Simplify the showcase template */
 	.page-template-showcase-php .featured-posts {
-		height: 280px;
+		min-height: 280px;
+	}
+	.featured-posts section.featured-post {
+		height: auto;
 	}
 	.page-template-showcase-php section.recent-posts {
 		float: none;
@@ -2186,6 +2236,13 @@ p.comment-form-comment {
 	#branding #searchform {
 		top: 1.625em !important;
 	}
+	/* Floated content doesn't work well at this size */
+	.alignleft,
+	.alignright {
+		float: none;
+		margin-left: 0;
+		margin-right: 0;
+	}
 	/* Make sure the post-post navigation doesn't collide with anything */
 	#nav-single {
 		display: block;