diff --git a/src/wp-admin/includes/theme.php b/src/wp-admin/includes/theme.php
index fa0707db7b..ad3781a9dc 100644
--- a/src/wp-admin/includes/theme.php
+++ b/src/wp-admin/includes/theme.php
@@ -405,10 +405,9 @@ function wp_prepare_themes_for_js( $themes = null ) {
 			'name'         => $theme->display( 'Name' ),
 			'screenshot'   => array( $theme->get_screenshot() ), // @todo multiple
 			'description'  => $theme->display( 'Description' ),
-			'author'       => $theme->get( 'Author' ),
-			'authorURI'    => $theme->get( 'AuthorURI' ),
-			'version'      => $theme->get( 'Version' ),
-			'tags'         => $theme->get( 'Tags' ),
+			'author'       => $theme->display( 'Author' ),
+			'version'      => $theme->display( 'Version' ),
+			'tags'         => $theme->display( 'Tags' ),
 			'parent'       => $parent,
 			'active'       => $slug === $current_theme,
 			'hasUpdate'    => isset( $updates[ $slug ] ),
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index 0341f9d72d..da790e4268 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -215,7 +215,7 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
 	<div class="theme-screenshot">
 		<img src="{{ data.screenshot[0] }}" alt="" />
 	</div>
-	<div class="theme-author"><?php printf( __( 'By %s' ), '{{ data.author }}' ); ?></div>
+	<div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
 	<h3 class="theme-name">{{ data.name }}</h3>
 	<div class="theme-actions">
 
@@ -266,12 +266,8 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
 			<# if ( data.active ) { #>
 				<span class="current-label"><?php _e( 'Current Theme' ); ?></span>
 			<# } #>
-			<h3 class="theme-name">{{ data.name }}<span class="theme-version"><?php _e('Version: '); ?> {{ data.version }}</span></h3>
-			<# if ( data.authorURI ) { #>
-				<h4 class="theme-author"><?php printf( __( 'By %s' ), '<a href="{{ data.authorURI }}">{{ data.author }}</a>' ); ?></h4>
-			<# } else { #>
-				<h4 class="theme-author"><?php printf( __( 'By %s' ), '{{ data.author }}' ); ?></h4>
-			<# } #>
+			<h3 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{{ data.version }}}' ); ?></span></h3>
+			<h4 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></h4>
 
 			<# if ( data.hasUpdate ) { #>
 			<div class="theme-update-message">
@@ -282,13 +278,13 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
 			<p class="theme-description">{{{ data.description }}}</p>
 
 			<# if ( data.parent ) { #>
-				<p class="parent-theme"><?php printf( __( 'This is a child theme of <strong>%s</strong>.' ), '{{ data.parent }}' ); ?></p>
+				<p class="parent-theme"><?php printf( __( 'This is a child theme of <strong>%s</strong>.' ), '{{{ data.parent }}}' ); ?></p>
 			<# } #>
 
-			<# if ( data.tags.length !== 0 ) { #>
+			<# if ( data.tags ) { #>
 				<p class="theme-tags">
 					<span><?php _e( 'Tags:' ); ?></span>
-					{{{ data.tags.join( ', ' ).replace( /-/g, ' ' ) }}}
+					{{{ data.tags.replace( /-/g, ' ' ) }}}
 				</p>
 			<# } #>
 		</div>