diff --git a/themes/wporg-5ftf/archive.php b/themes/wporg-5ftf/archive.php
index 5fcc779..e493d07 100644
--- a/themes/wporg-5ftf/archive.php
+++ b/themes/wporg-5ftf/archive.php
@@ -26,23 +26,19 @@ get_header(); ?>
 		while ( have_posts() ) :
 			the_post();
 
-			/*
-			 * Include the Post-Format-specific template for the content.
-			 * If you want to override this in a child theme, then include a file
-			 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-			 */
-			get_template_part( 'template-parts/content', 'page' );
+			get_template_part( 'template-parts/content', get_post_type() );
 
 		endwhile;
 
 		the_posts_pagination();
 
-	else :
+		?>
+
+	<?php else :
 
 		get_template_part( 'template-parts/content', 'none' );
 
-	endif;
-	?>
+	endif; ?>
 
 	</main><!-- #main -->
 
diff --git a/themes/wporg-5ftf/single.php b/themes/wporg-5ftf/single.php
index 075525b..b032a85 100644
--- a/themes/wporg-5ftf/single.php
+++ b/themes/wporg-5ftf/single.php
@@ -9,7 +9,7 @@ get_header(); ?>
 		<?php while ( have_posts() ) :
 			the_post();
 
-			get_template_part( 'template-parts/plugin', 'single' );
+			get_template_part( 'template-parts/content', get_post_type() );
 		endwhile; ?>
 
 	</main><!-- #main -->