diff --git a/app/helpers/language_helper.rb b/app/helpers/language_helper.rb
index b2194b1..c4f8dfb 100644
--- a/app/helpers/language_helper.rb
+++ b/app/helpers/language_helper.rb
@@ -4,7 +4,7 @@ module LanguageHelper
   end
 
   def tinymce_language
-    language.downcase
+    language.downcase.split('_').first
   end
 
   def html_language
diff --git a/app/views/shared/tiny_mce.rhtml b/app/views/shared/tiny_mce.rhtml
index 7dd4e22..be265e7 100644
--- a/app/views/shared/tiny_mce.rhtml
+++ b/app/views/shared/tiny_mce.rhtml
@@ -1,15 +1,38 @@
-<%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>
+<%= javascript_include_tag 'tinymce/jscripts/tiny_mce/tiny_mce.js' %>
 <script type="text/javascript">
 tinyMCE.init({
         mode : "textareas",
         theme : "advanced",
-        plugins: "paste,searchreplace,print",
+        plugins: "paste,searchreplace,print,media",
         theme_advanced_toolbar_location : "top",
         theme_advanced_layout_manager: 'SimpleLayout',
-        theme_advanced_buttons1 : "print,separator,copy,paste,pastetext,pasteword,separator,undo,redo,separator,search,replace,separator,formatselect,separator,help",
+        theme_advanced_buttons1 : "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,formatselect,separator,help",
         theme_advanced_buttons2 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code",
         theme_advanced_buttons3 : "",
+        paste_auto_cleanup_on_paste : true,
+        paste_insert_word_content_callback : "convertWord",
+        paste_use_dialog: false,
         apply_source_formatting : true,
         language: <%= tinymce_language.inspect %>
-});
+        });
+
+function convertWord(type, content) {
+  switch (type) {
+    // Gets executed before the built in logic performes it's cleanups
+    case "before":
+      //content = content.toLowerCase(); // Some dummy logic
+      break;
+
+    // Gets executed after the built in logic performes it's cleanups
+    case "after":
+      content = content.replace(/<!--\s*-->/, '');
+      break;
+  }
+
+  return content;
+}
 </script>
+
+
+
+
diff --git a/test/unit/language_helper_test.rb b/test/unit/language_helper_test.rb
index 80b5094..b6a2e0a 100644
--- a/test/unit/language_helper_test.rb
+++ b/test/unit/language_helper_test.rb
@@ -13,9 +13,9 @@ class LanguageHelperTest < Test::Unit::TestCase
     assert_equal 'pt_BR', self.language
   end
 
-  should 'downcase language for tinymce' do
+  should 'remove country code for TinyMCE' do
     self.expects(:language).returns('pt_BR')
-    assert_equal 'pt_br', tinymce_language
+    assert_equal 'pt', tinymce_language
   end
 
   should 'downcase and use dash for HTML language' do
--
libgit2 0.21.2