diff --git a/eva.info b/eva.info
index 515ed1b..f065cbb 100755
--- a/eva.info
+++ b/eva.info
@@ -4,8 +4,4 @@ core = 7.x
 dependencies[] = views
 package = Views
 
-files[] = eva-display-entity-view.tpl.php
-files[] = eva.module
-files[] = eva.theme.inc
-files[] = eva.views.inc
 files[] = eva_plugin_display_entity.inc
diff --git a/eva.module b/eva.module
index 70c2a74..132b3e2 100755
--- a/eva.module
+++ b/eva.module
@@ -1,5 +1,8 @@
 <?php
 
+// Load theme functions
+module_load_include('inc', 'eva', 'eva.theme');
+
 /**
  * Implements hook_views_api().
  */
diff --git a/eva.views.inc b/eva.views.inc
index 4fd1786..7fafc77 100755
--- a/eva.views.inc
+++ b/eva.views.inc
@@ -11,7 +11,6 @@ function eva_views_plugins() {
         'help' => t("Display the view as a part of an entity's content."),
         'handler' => 'eva_plugin_display_entity',
         'theme' => 'eva_display_entity_view',
-        'theme file' => 'eva.theme.inc',
         'uses hook entity view' => TRUE,
         'use ajax' => TRUE,
         'use pager' => TRUE,