diff --git a/app/helpers/wiki_external_filter_helper.rb b/app/helpers/wiki_external_filter_helper.rb
index 598cbfc..9af8c43 100644
--- a/app/helpers/wiki_external_filter_helper.rb
+++ b/app/helpers/wiki_external_filter_helper.rb
@@ -151,17 +151,17 @@ module WikiExternalFilterHelper
     result[:render_type] = 'block'
     result[:wiki_name] = wiki_name
     result[:inside] = render_common(result)
-    html = render_to_string(:template => 'wiki_external_filter/block', :layout => false, :locals => result).chop
+    html = render_to_string(:partial=> 'wiki_external_filter/block', :locals => result).chop
     html << headers_common(result).chop
     html
   end
 
   def render_common(result)
-    render_to_string :template => "wiki_external_filter/macro_#{result[:template]}", :layout => false, :locals => result
+    render_to_string :partial => "wiki_external_filter/macro_#{result[:template]}", :locals => result
   end
 
   def headers_common(result)
-    render_to_string :template => 'wiki_external_filter/headers', :layout => false, :locals => result
+    render_to_string :partial => 'wiki_external_filter/headers', :locals => result
   end
 
   class Macro
diff --git a/app/views/wiki_external_filter/headers.html.erb b/app/views/wiki_external_filter/_headers.html.erb
similarity index 100%
rename from app/views/wiki_external_filter/headers.html.erb
rename to app/views/wiki_external_filter/_headers.html.erb
diff --git a/app/views/wiki_external_filter/macro_flash-video.html.erb b/app/views/wiki_external_filter/_macro_flash-video.html.erb
similarity index 100%
rename from app/views/wiki_external_filter/macro_flash-video.html.erb
rename to app/views/wiki_external_filter/_macro_flash-video.html.erb
diff --git a/app/views/wiki_external_filter/macro_image.html.erb b/app/views/wiki_external_filter/_macro_image.html.erb
similarity index 100%
rename from app/views/wiki_external_filter/macro_image.html.erb
rename to app/views/wiki_external_filter/_macro_image.html.erb
diff --git a/app/views/wiki_external_filter/macro_svg.html.erb b/app/views/wiki_external_filter/_macro_svg.html.erb
similarity index 100%
rename from app/views/wiki_external_filter/macro_svg.html.erb
rename to app/views/wiki_external_filter/_macro_svg.html.erb
diff --git a/app/views/wiki_external_filter/macro_text.html.erb b/app/views/wiki_external_filter/_macro_text.html.erb
similarity index 100%
rename from app/views/wiki_external_filter/macro_text.html.erb
rename to app/views/wiki_external_filter/_macro_text.html.erb