diff --git a/assets/js/admin/editor-lang.php b/assets/js/admin/editor-lang.php
index d46119de..ee8c313f 100644
--- a/assets/js/admin/editor-lang.php
+++ b/assets/js/admin/editor-lang.php
@@ -4,7 +4,7 @@ $shortcodes = '';
 
 $options = array(
     'event' => array(
-        'details', 'results', 'performance'
+        'details', 'results', 'performance', 'venue', 'officials', 'teams',
     ),
     'team' => array(),
     'player' => array(
@@ -30,6 +30,9 @@ $raw = apply_filters( 'sportspress_tinymce_strings', array(
     'results' =>  __( 'Results', 'sportspress' ),
     'countdown' =>  __( 'Countdown', 'sportspress' ),
     'performance' =>  __( 'Box Score', 'sportspress' ),
+    'venue' =>  __( 'Venue', 'sportspress' ),
+    'officials' =>  __( 'Officials', 'sportspress' ),
+    'teams' =>  __( 'Teams', 'sportspress' ),
     'calendar' =>  __( 'Calendar', 'sportspress' ),
     'statistics' =>  __( 'Statistics', 'sportspress' ),
     'team' =>  __( 'Team', 'sportspress' ),
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-shortcode.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-shortcode.php
index f649422e..787dc1b3 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-shortcode.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-shortcode.php
@@ -23,6 +23,9 @@ class SP_Meta_Box_Event_Shortcode {
 			'event_results' => __( 'Results', 'sportspress' ),
 			'event_details' => __( 'Details', 'sportspress' ),
 			'event_performance' => __( 'Box Score', 'sportspress' ),
+			'event_venue' => __( 'Venue', 'sportspress' ),
+			'event_officials' => __( 'Officials', 'sportspress' ),
+			'event_teams' => __( 'Teams', 'sportspress' ),
 		) );
 		if ( $shortcodes ) {
 		?>
diff --git a/includes/class-sp-ajax.php b/includes/class-sp-ajax.php
index 7fb27639..985d351a 100644
--- a/includes/class-sp-ajax.php
+++ b/includes/class-sp-ajax.php
@@ -27,6 +27,9 @@ class SP_AJAX {
 			'event_details_shortcode' => false,
 			'event_results_shortcode' => false,
 			'event_performance_shortcode' => false,
+			'event_venue_shortcode' => false,
+			'event_officials_shortcode' => false,
+			'event_teams_shortcode' => false,
 			'event_calendar_shortcode' => false,
 			'event_list_shortcode' => false,
 			'event_blocks_shortcode' => false,
@@ -181,6 +184,96 @@ class SP_AJAX {
 		self::scripts();
 		die();
 	}
+	
+	/**
+	 * AJAX event_venue shortcode
+	 */
+	public function event_venue_shortcode() {
+		?>
+		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_venue">
+			<p>
+				<label>
+					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php
+					$args = array(
+						'post_type' => 'sp_event',
+						'name' => 'id',
+						'values' => 'ID',
+					);
+					sp_dropdown_pages( $args );
+					?>
+				</label>
+			</p>
+			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-venue' ); ?>
+			<p class="submit">
+				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_venue');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+			</p>
+		</div>
+		<?php
+		self::scripts();
+		die();
+	}
+	
+	/**
+	 * AJAX event_officials shortcode
+	 */
+	public function event_officials_shortcode() {
+		?>
+		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_officials">
+			<p>
+				<label>
+					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php
+					$args = array(
+						'post_type' => 'sp_event',
+						'name' => 'id',
+						'values' => 'ID',
+					);
+					sp_dropdown_pages( $args );
+					?>
+				</label>
+			</p>
+			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-officials' ); ?>
+			<p class="submit">
+				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_officials');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+			</p>
+		</div>
+		<?php
+		self::scripts();
+		die();
+	}
+	
+	/**
+	 * AJAX event_officials shortcode
+	 */
+	public function event_teams_shortcode() {
+		?>
+		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_teams">
+			<p>
+				<label>
+					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php
+					$args = array(
+						'post_type' => 'sp_event',
+						'name' => 'id',
+						'values' => 'ID',
+					);
+					sp_dropdown_pages( $args );
+					?>
+				</label>
+			</p>
+			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-teams' ); ?>
+			<p class="submit">
+				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_teams');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+			</p>
+		</div>
+		<?php
+		self::scripts();
+		die();
+	}
 
 	/**
 	 * AJAX event_calendar shortcode
diff --git a/includes/class-sp-shortcodes.php b/includes/class-sp-shortcodes.php
index c5ca521e..ae93b478 100644
--- a/includes/class-sp-shortcodes.php
+++ b/includes/class-sp-shortcodes.php
@@ -3,7 +3,7 @@
  * SP_Shortcodes class.
  *
  * @class 		SP_Shortcodes
- * @version		2.5.5
+ * @version		2.6.9
  * @package		SportsPress/Classes
  * @category	Class
  * @author 		ThemeBoy
@@ -19,6 +19,9 @@ class SP_Shortcodes {
 			'event_results'     => __CLASS__ . '::event_results',
 			'event_details'     => __CLASS__ . '::event_details',
 			'event_performance' => __CLASS__ . '::event_performance',
+			'event_venue' 		=> __CLASS__ . '::event_venue',
+			'event_officials' 	=> __CLASS__ . '::event_officials',
+			'event_teams' 		=> __CLASS__ . '::event_teams',
 			'countdown'         => __CLASS__ . '::countdown',
 			'player_details'    => __CLASS__ . '::player_details',
 			'player_statistics' => __CLASS__ . '::player_statistics',
@@ -101,6 +104,39 @@ class SP_Shortcodes {
 	public static function event_performance( $atts ) {
 		return self::shortcode_wrapper( array( 'SP_Shortcode_Event_Performance', 'output' ), $atts );
 	}
+	
+	/**
+	 * Event venue shortcode.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @return string
+	 */
+	public static function event_venue( $atts ) {
+		return self::shortcode_wrapper( array( 'SP_Shortcode_Event_Venue', 'output' ), $atts );
+	}
+	
+	/**
+	 * Event officials shortcode.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @return string
+	 */
+	public static function event_officials( $atts ) {
+		return self::shortcode_wrapper( array( 'SP_Shortcode_Event_Officials', 'output' ), $atts );
+	}
+	
+	/**
+	 * Event teams shortcode.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @return string
+	 */
+	public static function event_teams( $atts ) {
+		return self::shortcode_wrapper( array( 'SP_Shortcode_Event_Teams', 'output' ), $atts );
+	}
 
 	/**
 	 * Countdown shortcode.
diff --git a/includes/shortcodes/class-sp-shortcode-event-officials.php b/includes/shortcodes/class-sp-shortcode-event-officials.php
new file mode 100644
index 00000000..da6b4d24
--- /dev/null
+++ b/includes/shortcodes/class-sp-shortcode-event-officials.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Event Officials Shortcode
+ *
+ * @author 		ThemeBoy
+ * @category 	Shortcodes
+ * @package 	SportsPress/Shortcodes/Event_Officials
+ * @version     2.6.9
+ */
+class SP_Shortcode_Event_Officials {
+
+	/**
+	 * Output the event officials shortcode.
+	 *
+	 * @param array $atts
+	 */
+	public static function output( $atts ) {
+
+		if ( ! isset( $atts['id'] ) && isset( $atts[0] ) && is_numeric( $atts[0] ) )
+			$atts['id'] = $atts[0];
+
+		sp_get_template( 'event-officials.php', $atts );
+	}
+}
diff --git a/includes/shortcodes/class-sp-shortcode-event-teams.php b/includes/shortcodes/class-sp-shortcode-event-teams.php
new file mode 100644
index 00000000..429e4a23
--- /dev/null
+++ b/includes/shortcodes/class-sp-shortcode-event-teams.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Event Teams Shortcode
+ *
+ * @author 		ThemeBoy
+ * @category 	Shortcodes
+ * @package 	SportsPress/Shortcodes/Event_Officials
+ * @version     2.6.9
+ */
+class SP_Shortcode_Event_Teams {
+
+	/**
+	 * Output the event teams shortcode.
+	 *
+	 * @param array $atts
+	 */
+	public static function output( $atts ) {
+
+		if ( ! isset( $atts['id'] ) && isset( $atts[0] ) && is_numeric( $atts[0] ) )
+			$atts['id'] = $atts[0];
+
+		sp_get_template( 'event-logos.php', $atts );
+	}
+}
diff --git a/includes/shortcodes/class-sp-shortcode-event-venue.php b/includes/shortcodes/class-sp-shortcode-event-venue.php
new file mode 100644
index 00000000..37a330f0
--- /dev/null
+++ b/includes/shortcodes/class-sp-shortcode-event-venue.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Event Venue Shortcode
+ *
+ * @author 		ThemeBoy
+ * @category 	Shortcodes
+ * @package 	SportsPress/Shortcodes/Event_Venue
+ * @version     2.6.9
+ */
+class SP_Shortcode_Event_Venue {
+
+	/**
+	 * Output the event venue shortcode.
+	 *
+	 * @param array $atts
+	 */
+	public static function output( $atts ) {
+
+		if ( ! isset( $atts['id'] ) && isset( $atts[0] ) && is_numeric( $atts[0] ) )
+			$atts['id'] = $atts[0];
+
+		sp_get_template( 'event-venue.php', $atts );
+	}
+}