diff --git a/plugins/video/lib/video_block.rb b/plugins/video/lib/video_block.rb
index 486741e..fb7615d 100644
--- a/plugins/video/lib/video_block.rb
+++ b/plugins/video/lib/video_block.rb
@@ -35,7 +35,7 @@ class VideoBlock < Block
   def content(args={})
     block = self
 
-    lambda do
+    proc do
       render :file => 'video_block', :locals => { :block => block }
     end
   end
diff --git a/plugins/video/views/box_organizer/_html5_video_block.html.erb b/plugins/video/views/box_organizer/_html5_video_block.html.erb
new file mode 100644
index 0000000..a120a21
--- /dev/null
+++ b/plugins/video/views/box_organizer/_html5_video_block.html.erb
@@ -0,0 +1,3 @@
+<video controls preload="auto" width='<%="#{width}px"%>' height='<%="#{height}px"%>'>
+    <source src=<%= "#{url}" %>>
+</video>
diff --git a/plugins/video/views/box_organizer/_html5_video_block.rhtml b/plugins/video/views/box_organizer/_html5_video_block.rhtml
deleted file mode 100644
index a120a21..0000000
--- a/plugins/video/views/box_organizer/_html5_video_block.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<video controls preload="auto" width='<%="#{width}px"%>' height='<%="#{height}px"%>'>
-    <source src=<%= "#{url}" %>>
-</video>
diff --git a/plugins/video/views/box_organizer/_iframe_video_block.html.erb b/plugins/video/views/box_organizer/_iframe_video_block.html.erb
new file mode 100644
index 0000000..efd2994
--- /dev/null
+++ b/plugins/video/views/box_organizer/_iframe_video_block.html.erb
@@ -0,0 +1 @@
+<iframe width='<%="#{width}px"%>' height='<%="#{height}px"%>' src='<%= "#{url}" %>' frameborder="0" allowfullscreen></iframe>
diff --git a/plugins/video/views/box_organizer/_iframe_video_block.rhtml b/plugins/video/views/box_organizer/_iframe_video_block.rhtml
deleted file mode 100644
index efd2994..0000000
--- a/plugins/video/views/box_organizer/_iframe_video_block.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<iframe width='<%="#{width}px"%>' height='<%="#{height}px"%>' src='<%= "#{url}" %>' frameborder="0" allowfullscreen></iframe>
diff --git a/plugins/video/views/box_organizer/_video_block.html.erb b/plugins/video/views/box_organizer/_video_block.html.erb
new file mode 100644
index 0000000..c19d4b6
--- /dev/null
+++ b/plugins/video/views/box_organizer/_video_block.html.erb
@@ -0,0 +1,11 @@
+<label for="url" class="formlabel"> Video URL: </label>
+
+<div class="formfield type-text">
+  <%= text_field_tag 'block[url]', @block.url, :class => 'video-url', :maxlength => 255 %>
+</div>
+<div class="formfield type-text">
+  <label for="width" class="formlabel"> Width: </label>
+  <%= text_field_tag 'block[width]', @block.width, :size => 7, :class => 'video-width', :maxlength => 5 %>
+  <label for="height" class="formlabel"> Height: </label>
+  <%= text_field_tag 'block[height]', @block.height, :size => 7, :class => 'video-height', :maxlength => 5 %>
+</div>
diff --git a/plugins/video/views/box_organizer/_video_block.rhtml b/plugins/video/views/box_organizer/_video_block.rhtml
deleted file mode 100644
index c19d4b6..0000000
--- a/plugins/video/views/box_organizer/_video_block.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<label for="url" class="formlabel"> Video URL: </label>
-
-<div class="formfield type-text">
-  <%= text_field_tag 'block[url]', @block.url, :class => 'video-url', :maxlength => 255 %>
-</div>
-<div class="formfield type-text">
-  <label for="width" class="formlabel"> Width: </label>
-  <%= text_field_tag 'block[width]', @block.width, :size => 7, :class => 'video-width', :maxlength => 5 %>
-  <label for="height" class="formlabel"> Height: </label>
-  <%= text_field_tag 'block[height]', @block.height, :size => 7, :class => 'video-height', :maxlength => 5 %>
-</div>
diff --git a/plugins/video/views/video_block.html.erb b/plugins/video/views/video_block.html.erb
new file mode 100644
index 0000000..0bfbf68
--- /dev/null
+++ b/plugins/video/views/video_block.html.erb
@@ -0,0 +1,21 @@
+<h3 class="block-title">
+  <span><%=block.title%></span>
+</h3>
+<div class="video-block-data">
+  <% if block.is_youtube? %>
+    <div class='youtube'>
+      <%= render :partial => 'box_organizer/iframe_video_block', :locals => { :url => block.format_embed_video_url_for_youtube, :width => block.width, :height => block.height }%>
+    </div>
+  <% elsif block.is_vimeo? %>
+    <div class='vimeo'>
+      <%= render :partial => 'box_organizer/iframe_video_block', :locals => { :url => block.format_embed_video_url_for_vimeo, :width => block.width, :height => block.height }%>
+    </div>
+  <% elsif block.is_video_file? %>
+    <div class='video'>
+      <%= render :partial => 'box_organizer/html5_video_block', :locals => { :url => block.url, :width => block.width, :height => block.height }%>
+    </div>
+  <% else %>
+    <span class='alert-block'><%= _("Register a valid url (Vimeo, Youtube, video files)") %></span>
+  <% end %>
+
+</div>
diff --git a/plugins/video/views/video_block.rhtml b/plugins/video/views/video_block.rhtml
deleted file mode 100644
index 0bfbf68..0000000
--- a/plugins/video/views/video_block.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<h3 class="block-title">
-  <span><%=block.title%></span>
-</h3>
-<div class="video-block-data">
-  <% if block.is_youtube? %>
-    <div class='youtube'>
-      <%= render :partial => 'box_organizer/iframe_video_block', :locals => { :url => block.format_embed_video_url_for_youtube, :width => block.width, :height => block.height }%>
-    </div>
-  <% elsif block.is_vimeo? %>
-    <div class='vimeo'>
-      <%= render :partial => 'box_organizer/iframe_video_block', :locals => { :url => block.format_embed_video_url_for_vimeo, :width => block.width, :height => block.height }%>
-    </div>
-  <% elsif block.is_video_file? %>
-    <div class='video'>
-      <%= render :partial => 'box_organizer/html5_video_block', :locals => { :url => block.url, :width => block.width, :height => block.height }%>
-    </div>
-  <% else %>
-    <span class='alert-block'><%= _("Register a valid url (Vimeo, Youtube, video files)") %></span>
-  <% end %>
-
-</div>
--
libgit2 0.21.2