diff --git a/inc/jetpack.php b/inc/jetpack.php
index 2521630..a1a1603 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -1,44 +1,53 @@
 <?php
 /**
- * Jetpack Compatibility File.
+ * Jetpack Compatibility File
  *
- * @link https://jetpack.com/
+ * @link https://jetpack.me/
  *
- * @package understrap
+ * @package UnderStrap
  */
 
-if ( ! function_exists( 'understrap_jetpack_setup' ) ) {
-	/**
-	 * Jetpack setup function.
-	 *
-	 * See: https://jetpack.com/support/infinite-scroll/
-	 * See: https://jetpack.com/support/responsive-videos/
-	 */
-	function understrap_jetpack_setup() {
-		// Add theme support for Infinite Scroll.
-		add_theme_support( 'infinite-scroll', array(
-			'container' => 'main',
-			'render'    => 'understrap_infinite_scroll_render',
-			'footer'    => 'wrapper-footer',
-		) );
-		// Add theme support for Responsive Videos.
-		add_theme_support( 'jetpack-responsive-videos' );
-	}
+/**
+ * Jetpack setup function.
+ *
+ * See: https://jetpack.me/support/infinite-scroll/
+ * See: https://jetpack.me/support/responsive-videos/
+ */
+function components_jetpack_setup() {
+	// Add theme support for Infinite Scroll.
+	add_theme_support( 'infinite-scroll', array(
+		'container' => 'main',
+		'render'    => 'components_infinite_scroll_render',
+		'footer'    => 'page',
+	) );
+
+	// Add theme support for Responsive Videos.
+	add_theme_support( 'jetpack-responsive-videos' );
+
+	// Add theme support for Social Menus
+	add_theme_support( 'jetpack-social-menu' );
+
 }
-add_action( 'after_setup_theme', 'understrap_jetpack_setup' );
-if ( ! function_exists( 'understrap_infinite_scroll_render' ) ) {
-	/**
-	 * Custom render function for Infinite Scroll.
-	 */
-	function understrap_infinite_scroll_render() {
-		while ( have_posts() ) {
-			the_post();
-			if ( is_search() ) :
-				get_template_part( 'loop-templates/content', 'search' );
-			else :
-				get_template_part( 'loop-templates/content', get_post_format() );
-			endif;
-		}
+add_action( 'after_setup_theme', 'components_jetpack_setup' );
+
+/**
+ * Custom render function for Infinite Scroll.
+ */
+function components_infinite_scroll_render() {
+	while ( have_posts() ) {
+		the_post();
+		if ( is_search() ) :
+			get_template_part( 'components/post/content', 'search' );
+		else :
+			get_template_part( 'components/post/content', get_post_format() );
+		endif;
 	}
 }
 
+function components_social_menu() {
+	if ( ! function_exists( 'jetpack_social_menu' ) ) {
+		return;
+	} else {
+		jetpack_social_menu();
+	}
+}