diff --git a/footer.php b/footer.php
index 56a42da..7a641dc 100644
--- a/footer.php
+++ b/footer.php
@@ -11,7 +11,7 @@ $the_theme = wp_get_theme();
 $container = get_theme_mod( 'understrap_container_type' );
 ?>
 
-<?php get_sidebar( 'footerfull' ); ?>
+<?php get_template_part( 'sidebar-templates/sidebar', 'footerfull' ); ?>
 
 <div class="wrapper" id="wrapper-footer">
 
diff --git a/global-templates/hero.php b/global-templates/hero.php
index 05ddb3f..dbfae79 100644
--- a/global-templates/hero.php
+++ b/global-templates/hero.php
@@ -11,11 +11,11 @@
 
 	<div class="wrapper" id="wrapper-hero">
 	
-		<?php get_sidebar( 'hero' ); ?>
+		<?php get_template_part( 'sidebar-templates/sidebar', 'hero' ); ?>
 		
-		<?php get_sidebar( 'herocanvas' ); ?>
+		<?php get_template_part( 'sidebar-templates/sidebar', 'herocanvas' ); ?>
 
-		<?php get_sidebar( 'statichero' ); ?>
+		<?php get_template_part( 'sidebar-templates/sidebar', 'statichero' ); ?>
 
 	</div>
 
diff --git a/global-templates/left-sidebar-check.php b/global-templates/left-sidebar-check.php
index 8addadf..aa9afb1 100644
--- a/global-templates/left-sidebar-check.php
+++ b/global-templates/left-sidebar-check.php
@@ -12,7 +12,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 <?php if ( 'left' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-	<?php get_sidebar( 'left' ); ?>
+	<?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
 <?php endif; ?>
 
 <?php
diff --git a/global-templates/right-sidebar-check.php b/global-templates/right-sidebar-check.php
index 9a6314b..355c35e 100644
--- a/global-templates/right-sidebar-check.php
+++ b/global-templates/right-sidebar-check.php
@@ -12,6 +12,6 @@
 
 <?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
 
-  <?php get_sidebar( 'right' ); ?>
+  <?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
 
 <?php endif; ?>
diff --git a/package.json b/package.json
index effeef6..60b4e1d 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,9 @@
     "gulp-watch": "5.0.0",
     "merge2": "^1.2.1",
     "popper.js": "^1.14.1",
-    "rev-del": "1.0.5",
-    "undescores-for-npm": "^1.0.0"
+    "rev-del": "^1.0.5",
+    "undescores-for-npm": "^1.0.0",
+    "undescores-for-npm": "^1.0.0",
+
   }
 }
diff --git a/page-templates/both-sidebarspage.php b/page-templates/both-sidebarspage.php
index 24c7ce7..eee340a 100644
--- a/page-templates/both-sidebarspage.php
+++ b/page-templates/both-sidebarspage.php
@@ -17,7 +17,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<?php get_sidebar( 'left' ); ?>
+			<?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
 
 			<div
 				class="<?php
@@ -46,7 +46,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 			</div><!-- #primary -->
 
-			<?php get_sidebar( 'right' ); ?>
+			<?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
 			
 		</div><!-- .row -->
 
diff --git a/page-templates/left-sidebarpage.php b/page-templates/left-sidebarpage.php
index 4aeffd0..187592c 100644
--- a/page-templates/left-sidebarpage.php
+++ b/page-templates/left-sidebarpage.php
@@ -17,7 +17,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<?php get_sidebar( 'left' ); ?>
+			<?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
 
 			<div
 				class="<?php if ( is_active_sidebar( 'left-sidebar' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area"
diff --git a/page-templates/right-sidebarpage.php b/page-templates/right-sidebarpage.php
index f9630a4..6d4b8fc 100644
--- a/page-templates/right-sidebarpage.php
+++ b/page-templates/right-sidebarpage.php
@@ -40,7 +40,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 			</div><!-- #primary -->
 
-			<?php get_sidebar( 'right' ); ?>
+			<?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
 
 		</div><!-- .row -->
 
diff --git a/sidebar-footerfull.php b/sidebar-templates/sidebar-footerfull.php
similarity index 100%
rename from sidebar-footerfull.php
rename to sidebar-templates/sidebar-footerfull.php
diff --git a/sidebar-hero.php b/sidebar-templates/sidebar-hero.php
similarity index 100%
rename from sidebar-hero.php
rename to sidebar-templates/sidebar-hero.php
diff --git a/sidebar-herocanvas.php b/sidebar-templates/sidebar-herocanvas.php
similarity index 100%
rename from sidebar-herocanvas.php
rename to sidebar-templates/sidebar-herocanvas.php
diff --git a/sidebar-left.php b/sidebar-templates/sidebar-left.php
similarity index 94%
rename from sidebar-left.php
rename to sidebar-templates/sidebar-left.php
index 2ec7101..9c30014 100644
--- a/sidebar-left.php
+++ b/sidebar-templates/sidebar-left.php
@@ -20,4 +20,4 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 	<?php endif; ?>
 <?php dynamic_sidebar( 'left-sidebar' ); ?>
 
-</div><!-- #secondary -->
+</div><!-- #left-sidebar -->
diff --git a/sidebar-right.php b/sidebar-templates/sidebar-right.php
similarity index 94%
rename from sidebar-right.php
rename to sidebar-templates/sidebar-right.php
index 42cacfa..eca2a00 100644
--- a/sidebar-right.php
+++ b/sidebar-templates/sidebar-right.php
@@ -20,4 +20,4 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 	<?php endif; ?>
 <?php dynamic_sidebar( 'right-sidebar' ); ?>
 
-</div><!-- #secondary -->
+</div><!-- #right-sidebar -->
diff --git a/sidebar-statichero.php b/sidebar-templates/sidebar-statichero.php
similarity index 100%
rename from sidebar-statichero.php
rename to sidebar-templates/sidebar-statichero.php
diff --git a/sidebar.php b/sidebar.php
deleted file mode 100644
index 2560d75..0000000
--- a/sidebar.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * The sidebar containing the main widget area.
- *
- * @package understrap
- */
-
-if ( ! is_active_sidebar( 'sidebar-1' ) ) {
-	return;
-}
-?>
-
-<div class="col-md-4 widget-area" id="secondary" role="complementary">
-
-	<?php dynamic_sidebar( 'sidebar-1' ); ?>
-
-</div><!-- #secondary -->