diff --git a/index.php b/index.php
index 080728d..710ac42 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
 <?php endif; ?>
 
 <?php while (have_posts()) : the_post(); ?>
-  <?php get_template_part('templates/content', get_post_format()); ?>
+  <?php get_template_part('templates/content', get_post_type() != 'post' ? get_post_type() : get_post_format()); ?>
 <?php endwhile; ?>
 
 <?php the_posts_navigation(); ?>
diff --git a/single.php b/single.php
index 8850252..71b1840 100644
--- a/single.php
+++ b/single.php
@@ -1 +1 @@
-<?php get_template_part('templates/content', 'single'); ?>
+<?php get_template_part('templates/content-single', get_post_type()); ?>