diff --git a/plugins/raw.rb b/plugins/raw.rb
index 4b00262..36aa952 100644
--- a/plugins/raw.rb
+++ b/plugins/raw.rb
@@ -4,12 +4,12 @@
 module TemplateWrapper
   # Wrap input with a <div>
   def safe_wrap(input)
-    "<div class='bogus-wrapper'><notextile>#{input}</notextile></div>"
+    "<!--escape--><div class='escape-wrapper'><notextile><!--content-->#{input}<!--end-content--></notextile></div><!--end-escape-->"
   end
   # This must be applied after the
   def unwrap(input)
-    input.gsub /<div class='bogus-wrapper'><notextile>(.+?)<\/notextile><\/div>/m do
-      $1
+    input.gsub /<!--escape-->([\s\S]*?)<!--content-->(.+?)<!--end-content-->([\s\S]*?)<!--end-escape-->/m do
+      $2
     end
   end
 end