diff --git a/wp-content/themes/twentythirteen/content-audio.php b/wp-content/themes/twentythirteen/content-audio.php
index cd659a89bd..4e371ca2ae 100644
--- a/wp-content/themes/twentythirteen/content-audio.php
+++ b/wp-content/themes/twentythirteen/content-audio.php
@@ -19,11 +19,15 @@
 		<?php endif; // is_single() ?>
 	</header><!-- .entry-header -->
 
-	<div class="entry-content">
+	<div class="entry-media">
 		<div class="audio-content">
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+			<?php the_audio(); ?>
 		</div><!-- .audio-content -->
+	</div><!-- .entry-media -->
+
+	<div class="entry-content">
+		<?php the_extra_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/rtl.css b/wp-content/themes/twentythirteen/rtl.css
index a9fd811a06..071ad26904 100644
--- a/wp-content/themes/twentythirteen/rtl.css
+++ b/wp-content/themes/twentythirteen/rtl.css
@@ -341,7 +341,7 @@ div.nav-menu > ul {
 	margin-left: 5px;
 }
 
-.format-audio .entry-content:before {
+.format-audio .entry-media:before {
 	-ms-filter: "FlipH";
 	filter: FlipH;
 	float: right;
diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css
index 93756eec2b..90fc7a42e4 100644
--- a/wp-content/themes/twentythirteen/style.css
+++ b/wp-content/themes/twentythirteen/style.css
@@ -484,7 +484,7 @@ hr {
 .featured-post:before,
 .date a:before,
 .entry-meta .author a:before,
-.format-audio .entry-content:before,
+.format-audio .entry-media:before,
 .comments-link a:before,
 .tags-links a:first-child:before,
 .categories-links a:first-child:before,
@@ -504,6 +504,7 @@ hr {
 
 /* Clearing floats */
 .clear:after,
+.format-audio .entry-media:after,
 .attachment .entry-header:after,
 .site-footer .widget-area:after,
 .entry-content:after,
@@ -517,6 +518,8 @@ hr {
 
 .clear:before,
 .clear:after,
+.format-audio .entry-media:before,
+.format-audio .entry-media:after,
 .attachment .entry-header:before,
 .attachment .entry-header:after,
 .site-footer .widget-area:before,
@@ -1241,27 +1244,27 @@ footer.entry-meta {
 }
 
 /* Mediaelements */
-.entry-content .mejs-container .mejs-controls {
+.hentry .mejs-container .mejs-controls {
 	background: #220e10;
 }
 
-.entry-content .mejs-controls .mejs-time-rail .mejs-time-loaded,
-.entry-content .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current {
+.hentry .mejs-controls .mejs-time-rail .mejs-time-loaded,
+.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current {
 	background: #fff;
 }
 
-.entry-content .mejs-controls .mejs-time-rail .mejs-time-current {
+.hentry .mejs-controls .mejs-time-rail .mejs-time-current {
 	background: #ea9629;
 }
 
-.entry-content .mejs-controls .mejs-time-rail .mejs-time-total,
-.entry-content .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total {
+.hentry .mejs-controls .mejs-time-rail .mejs-time-total,
+.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total {
 	background: #595959;
 }
 
-.entry-content .mejs-controls .mejs-time-rail span,
-.entry-content .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total,
-.entry-content .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current {
+.hentry .mejs-controls .mejs-time-rail span,
+.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total,
+.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current {
 	border-radius: 0;
 }
 
@@ -1463,11 +1466,13 @@ footer.entry-meta {
 	font-weight: bold;
 }
 
-.format-audio .entry-meta a {
-	color: #fbfaf3;
+.format-audio .entry-media {
+	margin: 0 auto 24px;
+	max-width: 604px;
+	width: 100%;
 }
 
-.format-audio .entry-content:before {
+.format-audio .entry-media:before {
 	content: "\f109";
 	float: left;
 	font-size: 64px;
@@ -1476,17 +1481,10 @@ footer.entry-meta {
 }
 
 .format-audio .entry-content a,
-.single-format-audio .entry-content a {
-	color: #fbfaf3;
-}
-
+.format-audio .entry-meta a,
 .format-audio .entry-content a:hover,
 .format-audio .entry-meta a:hover {
-	color: #ea9629;
-}
-
-.format-audio .audio-content p:last-child {
-	margin-bottom: 0;
+	color: #fbfaf3;
 }
 
 .format-audio .audio-content {
@@ -1495,8 +1493,8 @@ footer.entry-meta {
 	float: right;
 	padding-left: 35px;
 	width: 80%;
-	width: -webkit-calc(100% - 115px);
-	width:         calc(100% - 115px);
+	width: -webkit-calc(100% - 85px);
+	width:         calc(100% - 85px);
 }
 
 .format-audio .wp-audio-shortcode {