diff --git a/events/ecp-page-template.php b/events/ecp-page-template.php
new file mode 100644
index 0000000..c951ffd
--- /dev/null
+++ b/events/ecp-page-template.php
@@ -0,0 +1,36 @@
+<?php
+/**
+*  If 'Default Events Template' is selected in Settings -> The Events Calendar -> Theme Settings -> Events Template, 
+*  then this file loads the page template for all ECP views except for the individual 
+*  event view.  Generally, this setting should only be used if you want to manually 
+*  specify all the shell HTML of your ECP pages in this template file.  Use one of the other Theme 
+*  Settings -> Events Template to automatically integrate views into your 
+*  theme.
+*
+* You can customize this view by putting a replacement file of the same name (ecp-page-template.php) in the events/ directory of your theme.
+*/
+
+// Don't load directly
+if ( !defined('ABSPATH') ) { die('-1'); }
+
+//added this code so we can support the-events-calendar plugin
+
+	$view = tribe_get_current_template();
+	if( basename($view) === 'gridview.php' ){
+		add_filter('espresso_content_layout','espresso_tec_edit_layout');
+	}
+		
+	function espresso_tec_edit_layout(){
+		return 'content';
+	}
+
+
+
+?>	
+<?php tribe_events_before_html(); ?>
+<?php get_template_part('espresso-template-before'); ?>
+<h2 class="tribe-events-cal-title"><?php tribe_events_title(); ?></h2>
+<?php include(tribe_get_current_template()); ?>
+
+<?php get_template_part('espresso-template-after'); ?>
+<?php tribe_events_after_html(); ?>
\ No newline at end of file
diff --git a/events/ecp-single-template.php b/events/ecp-single-template.php
new file mode 100644
index 0000000..7502610
--- /dev/null
+++ b/events/ecp-single-template.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*  If 'Default Events Template' is selected in Settings -> The Events Calendar -> Theme Settings -> Events Template, 
+*  then this file loads the page template for all for the individual 
+*  event view.  Generally, this setting should only be used if you want to manually 
+*  specify all the shell HTML of your ECP pages in this template file.  Use one of the other Theme 
+*  Settings -> Events Template to automatically integrate views into your 
+*  theme.
+*
+* You can customize this view by putting a replacement file of the same name (ecp-single-template.php) in the events/ directory of your theme.
+*/
+
+// Don't load directly
+if ( !defined('ABSPATH') ) { die('-1'); }
+?>
+<?php tribe_events_before_html(); ?>
+<?php get_template_part('espresso-template-before'); ?>
+<div id="container">
+	<div class="tribe-events-event widecolumn">
+		<?php the_post(); global $post; ?>
+		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<h2 class="entry-title"><?php the_title(); ?></h2>
+			<?php include(tribe_get_current_template()); ?>
+			<?php edit_post_link(__('Edit','tribe-events-calendar'), '<span class="edit-link">', '</span>'); ?>
+		</div><!-- post -->
+		<?php if(tribe_get_option('showComments','no') == 'yes'){ comments_template(); } ?>
+	</div><!-- #content -->
+</div><!--#container-->
+<?php get_template_part('espresso-template-after'); ?>
+<?php tribe_events_after_html(); ?>
diff --git a/functions.php b/functions.php
index 3a833d7..81103c0 100755
--- a/functions.php
+++ b/functions.php
@@ -154,6 +154,7 @@ function removeHeadLinks() {
 }
 add_action( 'after_setup_theme', 'espresso_setup' );
 
+
 /**
 * Register all the scripts for espresso
 *