diff --git a/wp-content/themes/twentythirteen/content-audio.php b/wp-content/themes/twentythirteen/content-audio.php
index 4cd40aba02..23abeaf175 100644
--- a/wp-content/themes/twentythirteen/content-audio.php
+++ b/wp-content/themes/twentythirteen/content-audio.php
@@ -19,15 +19,11 @@
 		<?php endif; // is_single() ?>
 	</header><!-- .entry-header -->
 
-	<div class="entry-media">
-		<div class="audio-content">
-			<?php the_post_format_audio(); ?>
-		</div><!-- .audio-content -->
-	</div><!-- .entry-media -->
-
 	<div class="entry-content">
-		<?php the_remaining_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 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>' ) ); ?>
+		</div><!-- .audio-content -->
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-chat.php b/wp-content/themes/twentythirteen/content-chat.php
index 81444e41d8..eb2fe69bce 100644
--- a/wp-content/themes/twentythirteen/content-chat.php
+++ b/wp-content/themes/twentythirteen/content-chat.php
@@ -20,7 +20,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_post_format_chat(); ?>
+		<?php the_content(); ?>
 		<?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 -->
 
diff --git a/wp-content/themes/twentythirteen/content-gallery.php b/wp-content/themes/twentythirteen/content-gallery.php
index 3bc5751831..b9537e8554 100644
--- a/wp-content/themes/twentythirteen/content-gallery.php
+++ b/wp-content/themes/twentythirteen/content-gallery.php
@@ -24,7 +24,7 @@
 			<?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 else : ?>
-			<?php the_post_format_gallery(); ?>
+			<?php echo get_post_gallery(); ?>
 		<?php endif; // is_single() ?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-image.php b/wp-content/themes/twentythirteen/content-image.php
index d27ca6f2a9..34f5144181 100644
--- a/wp-content/themes/twentythirteen/content-image.php
+++ b/wp-content/themes/twentythirteen/content-image.php
@@ -9,10 +9,6 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<div class="entry-media">
-		<?php the_post_format_image( 'twentythirteen-image-post' ); ?>
-	</div><!-- .entry-media -->
-
 	<header class="entry-header">
 		<?php if ( is_single() ) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
@@ -24,7 +20,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_remaining_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?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>' ) ); ?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-video.php b/wp-content/themes/twentythirteen/content-video.php
index 6c801bff85..af2ff71cd2 100644
--- a/wp-content/themes/twentythirteen/content-video.php
+++ b/wp-content/themes/twentythirteen/content-video.php
@@ -9,10 +9,6 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<div class="entry-media">
-		<?php the_post_format_video(); ?>
-	</div><!-- .entry-media -->
-
 	<header class="entry-header">
 		<?php if ( is_single() ) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
@@ -24,7 +20,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_remaining_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?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>' ) ); ?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/css/editor-style.css b/wp-content/themes/twentythirteen/css/editor-style.css
index bb051a9cbd..71b63d027e 100644
--- a/wp-content/themes/twentythirteen/css/editor-style.css
+++ b/wp-content/themes/twentythirteen/css/editor-style.css
@@ -14,8 +14,7 @@ Description: Used to style the TinyMCE editor.
  * 5.0 - Alignment
  * 6.0 - Tables
  * 7.0 - Images
- * 8.0 - Post Formats
- * 9.0 - RTL
+ * 8.0 - RTL
  * ----------------------------------------------------------------------------
  */
 
@@ -365,154 +364,9 @@ img {
 	padding: 0;
 }
 
-/**
- * 8.0 Post Formats
- * ----------------------------------------------------------------------------
- */
-
-/* Aside */
-.post-format-aside {
-	background-color: #f7f5e7;
-}
-
-.post-format-aside blockquote {
-	font-size: 100%;
-	font-weight: normal;
-}
-
-.post-format-aside cite {
-	font-size: 100%;
-	text-transform: none;
-}
-
-.post-format-aside cite:before {
-	content: "\2014";
-	margin-right: 5px;
-}
-
-/* Audio */
-.post-format-audio {
-	background-color: #db572f;
-}
-
-.post-format-audio a {
-	color: #fbfaf3;
-}
-
-/* Chat */
-.post-format-chat {
-	background-color: #eadaa6;
-}
-
-.post-format-chat a {
-	color: #722d19;
-}
-
-/* Gallery */
-.post-format-gallery {
-	background-color: #fbca3c;
-}
-
-.post-format-gallery a {
-	color: #722d19;
-}
-
-/* Image: same as Standard/Defaults */
-
-/* Link */
-.post-format-link {
-	background-color: #f7f5e7;
-}
-
-/* Quote */
-.post-format-quote {
-	background-color: #210d10;
-	color: #f7f5e7;
-}
-
-.post-format-quote blockquote {
-	font-size: 28px;
-	font-style: italic;
-	font-weight: 300;
-	margin: 0;
-	padding-left: 75px;
-	position: relative;
-}
-
-.post-format-quote blockquote:before {
-	content: '\201C';
-	font-size: 140px;
-	font-weight: 400;
-	line-height: .8;
-	padding-right: 25px;
-	position: absolute;
-	left: -15px;
-	top: -3px;
-}
-
-.post-format-quote a {
-	color: #e63f2a;
-}
-
-.post-format-quote .quote-caption,
-.post-format-quote blockquote small,
-.post-format-quote blockquote cite {
-	display: block;
-	font-size: 16px;
-}
-
-/* Status */
-.post-format-status {
-	background-color: #722d19;
-	color: #f7f5e7;
-	font-style: italic;
-	font-weight: 300;
-	padding: 0;
-	padding-left: 35px;
-}
-
-.post-format-status.mceContentBody {
-	font-size: 24px;
-}
-
-.post-format-status:before {
-	background-size: 4px 4px;
-	background: url(../images/dotted-line.png) repeat-y left bottom;
-	content: "";
-	display: block;
-	height: 100%;
-	position: absolute;
-	left: 15px;
-	top: 0;
-	width: 1px;
-}
-
-.post-format-status p:first-child:before {
-	background-color: rgba(0, 0, 0, 0.65);
-	content: "";
-	height: 3px;
-	width: 13px;
-	margin-top: 13px;
-	position: absolute;
-	left: 9px;
-}
-
-.post-format-status a {
-	color: #eadaa6;
-}
-
-/* Video */
-.post-format-video {
-	background-color: #db572f;
-}
-
-.post-format-video a {
-	color: #fbfaf3;
-}
-
 
 /**
- * 9.0 RTL
+ * 8.0 RTL
  * ----------------------------------------------------------------------------
  */
 
diff --git a/wp-content/themes/twentythirteen/css/ie.css b/wp-content/themes/twentythirteen/css/ie.css
index f574e5e91e..2b7cbc2234 100644
--- a/wp-content/themes/twentythirteen/css/ie.css
+++ b/wp-content/themes/twentythirteen/css/ie.css
@@ -10,7 +10,7 @@ Styles for older IE versions (previous to IE9).
 .menu-toggle:after:hover,
 .date a:before:hover,
 .entry-meta .author a:before:hover,
-.format-audio .entry-media:before:hover,
+.format-audio .entry-content:before:hover,
 .comments-link a:before:hover,
 .tags-links a:first-child:before:hover,
 .categories-links a:first-child:before:hover,
@@ -280,12 +280,8 @@ img.alignleft {
 	left: auto;
 }
 
-.ie7 .format-quote .quote {
-	padding: 0;
-}
-
 /* RTL for Internet Explorer 7 & 8 */
-.rtl .format-audio .entry-media:before,
+.rtl .format-audio .entry-content:before,
 .rtl .comment-reply-link:before,
 .rtl .comment-reply-login:before {
 	-ms-filter: "FlipH";
diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
index fbcdf6aac2..a2a615605b 100644
--- a/wp-content/themes/twentythirteen/functions.php
+++ b/wp-content/themes/twentythirteen/functions.php
@@ -95,9 +95,6 @@ function twentythirteen_setup() {
 	add_theme_support( 'post-thumbnails' );
 	set_post_thumbnail_size( 604, 270, true );
 
-	// Register custom image size for image post formats.
-	add_image_size( 'twentythirteen-image-post', 724, 1288 );
-
 	// This theme uses its own gallery styles.
 	add_filter( 'use_default_gallery_style', '__return_false' );
 }
@@ -436,7 +433,8 @@ endif;
  * @return string The Link format URL.
  */
 function twentythirteen_get_link_url() {
-	$has_url = get_the_post_format_url();
+	$content = get_the_content();
+	$has_url = get_content_url( $content );
 
 	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
 }
@@ -492,33 +490,15 @@ add_filter( 'body_class', 'twentythirteen_body_class' );
  * @return void
  */
 function twentythirteen_content_width() {
-	if ( has_post_format( 'video' ) || is_attachment() ) {
-		global $content_width;
+	global $content_width;
+
+	if ( is_attachment() )
 		$content_width = 724;
-	}
+	elseif ( has_post_format( 'audio' ) )
+		$content_width = 484;
 }
 add_action( 'template_redirect', 'twentythirteen_content_width' );
 
-/**
- * Adjusts content_width value for video shortcodes in video post formats.
- *
- * @since Twenty Thirteen 1.0
- *
- * @param array $atts The attribute list.
- * @return array The filtered attribute list.
- */
-function twentythirteen_video_width( $atts ) {
-	if ( ! is_admin() && has_post_format( 'video' ) ) {
-		$new_width = 724;
-		$atts['height'] = round( ( $atts['height'] * $new_width ) / $atts['width'] );
-		$atts['width'] = $new_width;
-	}
-
-	return $atts;
-}
-add_action( 'embed_defaults',       'twentythirteen_video_width' );
-add_action( 'shortcode_atts_video', 'twentythirteen_video_width' );
-
 /**
  * Switches default core markup for search form to output valid HTML5.
  *
diff --git a/wp-content/themes/twentythirteen/js/functions.js b/wp-content/themes/twentythirteen/js/functions.js
index 19fdb17738..87b42b2bd5 100644
--- a/wp-content/themes/twentythirteen/js/functions.js
+++ b/wp-content/themes/twentythirteen/js/functions.js
@@ -8,7 +8,6 @@
 	var html               = $( 'html' ),
 	    body               = $( 'body' ),
 	    _window            = $( window ),
-	    captions           = $( '.quote-caption' ),
 	    adjustFooter,
 
 	/**
@@ -71,12 +70,6 @@
 		}
 	} );
 
-	/** Better styles for Quote post formats with a linked source.
-	 *
-	 */
-	if ( captions )
-		captions.has( 'a' ).addClass( 'linked' );
-
 	/**
 	 * Arranges footer widgets vertically.
 	 */
diff --git a/wp-content/themes/twentythirteen/rtl.css b/wp-content/themes/twentythirteen/rtl.css
index 1d0d8b8d4e..0772a6c006 100644
--- a/wp-content/themes/twentythirteen/rtl.css
+++ b/wp-content/themes/twentythirteen/rtl.css
@@ -151,11 +151,6 @@ div.nav-menu > ul {
  * ----------------------------------------------------------------------------
  */
 
-.sidebar .entry-media {
-	padding-left: 316px;
-	padding-right: 0;
-}
-
 .sidebar .entry-header,
 .sidebar .entry-content,
 .sidebar .entry-summary,
@@ -245,7 +240,6 @@ div.nav-menu > ul {
  * ----------------------------------------------------------------------------
  */
 
-.entry-media a,
 .entry-content a {
 	display: inline;
 }
@@ -260,7 +254,7 @@ div.nav-menu > ul {
 	margin-left: 5px;
 }
 
-.format-audio .entry-media:before {
+.format-audio .entry-content:before {
 	float: right;
 	-webkit-transform: scaleX(-1);
 	-moz-transform:    scaleX(-1);
@@ -269,12 +263,6 @@ div.nav-menu > ul {
 	transform:         scaleX(-1);
 }
 
-.format-audio .entry-media,
-.sidebar .format-audio .entry-media {
-	padding-left: 374px;
-	padding-right: 60px;
-}
-
 .format-audio .audio-content {
 	background-position: right top;
 	float: left;
@@ -343,12 +331,12 @@ div.nav-menu > ul {
 	right: 64px;
 }
 
-.format-quote .quote {
+.format-quote blockquote {
 	padding-left: 0;
 	padding-right: 75px;
 }
 
-.format-quote .quote:before {
+.format-quote blockquote:before {
 	content: '\201D';
 	padding-left: 25px;
 	padding-right: 0;
@@ -608,13 +596,6 @@ div.nav-menu > ul {
  */
 
 @media (max-width: 1069px) {
-	.sidebar .entry-media,
-	.format-audio .entry-media,
-	.sidebar .format-audio .entry-media {
-		padding-left: 376px;
-		padding-right: 60px;
-	}
-
 	ul.nav-menu,
 	div.nav-menu > ul {
 		margin-left: auto;
@@ -656,13 +637,6 @@ div.nav-menu > ul {
 		padding-right: 0;
 	}
 
-	.sidebar .entry-media,
-	.format-audio .entry-media,
-	.sidebar .format-audio .entry-media {
-		padding-left: 0;
-		padding-right: 0;
-	}
-
 	.site-main .widget-area {
 		float: none;
 		margin-left: auto;
diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css
index ffa4c15e2b..e3d0c0dd1f 100644
--- a/wp-content/themes/twentythirteen/style.css
+++ b/wp-content/themes/twentythirteen/style.css
@@ -257,8 +257,7 @@ blockquote blockquote {
 }
 
 blockquote cite,
-blockquote small,
-.quote-caption {
+blockquote small {
 	font-size: 14px;
 	font-weight: normal;
 	text-transform: uppercase;
@@ -480,7 +479,7 @@ hr {
 .featured-post:before,
 .date a:before,
 .entry-meta .author a:before,
-.format-audio .entry-media:before,
+.format-audio .entry-content:before,
 .comments-link a:before,
 .tags-links a:first-child:before,
 .categories-links a:first-child:before,
@@ -502,7 +501,6 @@ hr {
 
 /* Clearing floats */
 .clear:after,
-.entry-media:after,
 .attachment .entry-header:after,
 .site-footer .widget-area:after,
 .entry-content:after,
@@ -516,8 +514,6 @@ hr {
 
 .clear:before,
 .clear:after,
-.entry-media:before,
-.entry-media:after,
 .attachment .entry-header:before,
 .attachment .entry-header:after,
 .site-footer .widget-area:before,
@@ -676,7 +672,6 @@ img[class*="attachment-"] {
 	height: auto;
 }
 
-.entry-media img,
 img.size-full,
 img.size-large,
 img.wp-post-image {
@@ -1126,8 +1121,7 @@ ul.nav-menu li:hover > ul,
 }
 
 .entry-content blockquote cite,
-.entry-content blockquote small,
-.entry-content .quote-caption {
+.entry-content blockquote small {
 	font-size: 16px;
 }
 
@@ -1365,23 +1359,6 @@ footer.entry-meta {
  * ----------------------------------------------------------------------------
  */
 
-.entry-media {
-	margin: 0 auto 24px;
-	max-width: 724px;
-	width: 100%;
-}
-
-.sidebar .entry-media {
-	max-width: 1040px;
-	padding: 0 316px 0 0;
-}
-
-.entry-media .wp-caption,
-.entry-media .wp-caption-text,
-.entry-media [class*="align"] {
-	margin: 0 auto;
-}
-
 /* Aside */
 .format-aside {
 	background-color: #f7f5e7;
@@ -1424,16 +1401,7 @@ footer.entry-meta {
 	font-weight: bold;
 }
 
-.format-audio .entry-media {
-	max-width: 604px;
-}
-
-.sidebar .format-audio .entry-media {
-	max-width: 1040px;
-	padding: 0 374px 0 60px;
-}
-
-.format-audio .entry-media:before {
+.format-audio .entry-content:before {
 	content: "\f109";
 	float: left;
 	font-size: 64px;
@@ -1682,21 +1650,20 @@ footer.entry-meta {
 	text-decoration: none;
 }
 
-.format-quote .quote-caption,
 .format-quote blockquote small,
 .format-quote blockquote cite {
 	display: block;
 	font-size: 16px;
 }
 
-.format-quote .quote {
+.format-quote blockquote {
 	font-style: italic;
 	font-weight: 300;
 	padding-left: 75px;
 	position: relative;
 }
 
-.format-quote .quote:before {
+.format-quote blockquote:before {
 	content: '\201C';
 	font-size: 140px;
 	font-weight: 400;
@@ -2711,10 +2678,6 @@ footer.entry-meta {
 }
 
 @media (max-width: 1069px) {
-	.sidebar .entry-media {
-		padding: 0 376px 0 60px;
-	}
-
 	.sidebar img.alignleft,
 	.sidebar .wp-caption.alignleft {
 		margin-left: 0;
@@ -2781,9 +2744,7 @@ footer.entry-meta {
 	.sidebar #respond #commentform,
 	.sidebar .featured-gallery,
 	.sidebar .post-navigation .nav-links,
-	.author.sidebar .author-info,
-	.format-audio .entry-media,
-	.sidebar .format-audio .entry-media {
+	.author.sidebar .author-info {
 		max-width: 604px;
 		padding-left: 0;
 		padding-right: 0;
@@ -2801,11 +2762,6 @@ footer.entry-meta {
 		max-width: 604px;
 	}
 
-	.sidebar .entry-media {
-		max-width: 724px;
-	}
-
-	.sidebar .entry-media,
 	.sidebar .archive-meta,
 	.attachment .entry-header,
 	.search.sidebar .page-content,
@@ -2886,11 +2842,6 @@ footer.entry-meta {
 		margin-right: 0;
 	}
 
-	.entry-media,
-	.sidebar .entry-media {
-		max-width: 604px;
-	}
-
 	.attachment .image-navigation,
 	.attachment .entry-attachment .attachment {
 		max-width: 604px;
@@ -2908,7 +2859,6 @@ footer.entry-meta {
 		font-size: 30px;
 	}
 
-	#content .entry-media,
 	#content .entry-header,
 	#content .entry-content,
 	#content .entry-summary,
@@ -3024,8 +2974,7 @@ footer.entry-meta {
 	}
 
 	.format-quote blockquote small,
-	.format-quote blockquote cite,
-	.format-quote .quote-caption {
+	.format-quote blockquote cite {
 		font-size: 13px;
 	}
 
@@ -3066,16 +3015,16 @@ footer.entry-meta {
 	}
 
 	/* Audio */
+	.format-audio .entry-content:before {
+		display: none;
+	}
+
 	.format-audio .audio-content {
 		background-image: none;
 		float: none;
 		padding-left: 0;
 		width: auto;
 	}
-
-	.format-audio .entry-media:before {
-		display: none;
-	}
 }
 
 /* Mobile devices */