diff --git a/src/author.php b/src/author.php
index c5a56f4..955c17b 100644
--- a/src/author.php
+++ b/src/author.php
@@ -21,7 +21,7 @@ if (
                 <header class="mb-4 border-bottom">
                     <?php if ($isAuthor === true): ?>
                         <h1>
-                            <?php _e('Posts by: ', 'tainacan'); echo get_the_author_meta( 'display_name' ); ?>
+                            <?php _e('Posts by: ', 'tainacan-theme'); echo get_the_author_meta( 'display_name' ); ?>
                         </h1>
                     <?php endif; ?>
                 </header>
diff --git a/src/category.php b/src/category.php
index d2f95df..d6d7c03 100644
--- a/src/category.php
+++ b/src/category.php
@@ -7,7 +7,7 @@
             <div id="content" role="main">
                 <header class="mb-4 border-bottom">
                     <h1>
-                        <?php _e('Category: ', 'tainacan'); echo single_cat_title(); ?>
+                        <?php _e('Category: ', 'tainacan-theme'); echo single_cat_title(); ?>
                     </h1>
                 </header>
                 <?php get_template_part('template-parts/index-loop'); ?>
diff --git a/src/functions/pagination.php b/src/functions/pagination.php
index 20b7de5..3b5e4a0 100644
--- a/src/functions/pagination.php
+++ b/src/functions/pagination.php
@@ -14,8 +14,8 @@ if ( ! function_exists( 'pagination_bst4' ) ) {
 			'total' => $wp_query->max_num_pages,
 			'mid_size' => 5,
 			'prev_next' => True,
-			'prev_text' => __('< Newer', 'tainacan'),
-			'next_text' => __('Older >', 'tainacan'),
+			'prev_text' => __('< Newer', 'tainacan-theme'),
+			'next_text' => __('Older >', 'tainacan-theme'),
 			'type' => 'list'
 		) );
 		$paginate_links = str_replace( "<ul class='page-numbers'>", "<ul class='pagination'>", $paginate_links );
diff --git a/src/search.php b/src/search.php
index f307aca..6ed1d67 100644
--- a/src/search.php
+++ b/src/search.php
@@ -6,7 +6,7 @@
         <div class="col-sm">
             <div id="content" role="main">
                 <header class="mb-4 border-bottom">
-                    <h1><?php _e('Search Results for', 'tainacan'); ?> &ldquo;<?php the_search_query(); ?>&rdquo;</h1>
+                    <h1><?php _e('Search Results for', 'tainacan-theme'); ?> &ldquo;<?php the_search_query(); ?>&rdquo;</h1>
                 </header>
             <?php get_template_part('template-parts/search-results'); ?>
             </div><!-- /#content -->
diff --git a/src/single.php b/src/single.php
index c4c0a46..cda2422 100644
--- a/src/single.php
+++ b/src/single.php
@@ -3,13 +3,14 @@
 <div class="container-fluid mt-5">
     <div class="row">
 
-        <div class="col-sm">
+        <div class="col-sm-9">
             <div id="content" role="main">
                 <?php get_template_part('template-parts/single-post', get_post_format()); ?>
             </div><!-- /#content -->
         </div>
-
-        <?php get_sidebar(); ?>
+        <div class="col-sm-3">
+            <?php get_sidebar(); ?>
+        </div>
 
     </div><!-- /.row -->
 </div><!-- /.container-fluid -->
diff --git a/src/template-parts/index-loop.php b/src/template-parts/index-loop.php
index 2f900e5..fb97362 100644
--- a/src/template-parts/index-loop.php
+++ b/src/template-parts/index-loop.php
@@ -12,7 +12,7 @@
         </div>
 
     <?php endwhile; else: ?>
-    <p><?php _e('Sorry, no posts matched your criteria.', 'tainacan'); ?></p>
+    <p><?php _e('Sorry, no posts matched your criteria.', 'tainacan-theme'); ?></p>
     <?php endif; ?>
 </div>
 
diff --git a/src/template-parts/search-loop.php b/src/template-parts/search-loop.php
index 871a292..3e9ee59 100644
--- a/src/template-parts/search-loop.php
+++ b/src/template-parts/search-loop.php
@@ -7,6 +7,6 @@
     </article>
 <?php endwhile; else: ?>
         <div class="alert alert-warning">
-            <i class="material-icons">warning</i> <?php _e('Sorry, your search yielded no results.', 'tainacan'); ?>
+            <i class="material-icons">warning</i> <?php _e('Sorry, your search yielded no results.', 'tainacan-theme'); ?>
         </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/src/template-parts/single-post.php b/src/template-parts/single-post.php
index f71fed0..fe509cd 100644
--- a/src/template-parts/single-post.php
+++ b/src/template-parts/single-post.php
@@ -6,9 +6,9 @@
       </h1>
       <div class="header-meta text-muted">
         <?php
-          _e('By ', 'tainacan');
+          _e('By ', 'tainacan-theme');
           the_author_posts_link();
-          _e(' on ', 'tainacan');
+          _e(' on ', 'tainacan-theme');
           tainacan_post_date();
         ?>
       </div>
@@ -22,14 +22,14 @@
     </main>
     <footer class="mt-5 border-top pt-3">
       <p>
-        <?php _e('Category: ', 'tainacan'); the_category(', ') ?> | <?php if (has_tag()) { the_tags('Tags: ', ', '); ?> | <?php } _e('Comments', 'tainacan'); ?>: <?php comments_popup_link(__('None', 'tainacan'), '1', '%'); ?>
+        <?php _e('Category: ', 'tainacan-theme'); the_category(', ') ?> | <?php if (has_tag()) { the_tags('Tags: ', ', '); ?> | <?php } _e('Comments', 'tainacan-theme'); ?>: <?php comments_popup_link(__('None', 'tainacan-theme'), '1', '%'); ?>
       </p>
       <div class="author-bio media border-top pt-3">
         <?php get_avatar(); ?>
         <div class="media-body ml-3">
           <p class="h4 author-name"><?php the_author_posts_link(); ?></p>
           <p class="author-description"><?php the_author_description(); ?></p>
-          <p class="author-other-posts mb-0 border-top pt-3"><?php _e('Other posts by ', 'tainacan'); the_author_posts_link(); ?></p>
+          <p class="author-other-posts mb-0 border-top pt-3"><?php _e('Other posts by ', 'tainacan-theme'); the_author_posts_link(); ?></p>
         </div>
       </div><!-- /.author-bio -->
     </footer>
@@ -42,12 +42,4 @@
     wp_redirect(esc_url( home_url() ) . '/404', 404);
     exit;
   endif;
-?>
-<div class="row mt-5 border-top pt-3">
-  <div class="col">
-    <?php previous_post_link('%link', '<i class="fas fa-fw fa-arrow-left"></i> Previous post: '.'%title'); ?>
-  </div>
-  <div class="col text-right">
-    <?php next_post_link('%link', 'Next post: '.'%title' . ' <i class="fas fa-fw fa-arrow-right"></i>'); ?>
-  </div>
-</div>
\ No newline at end of file
+?>
\ No newline at end of file