diff --git a/xblockutils/__init__.py b/xblockutils/__init__.py
index 38e00af..afd7903 100644
--- a/xblockutils/__init__.py
+++ b/xblockutils/__init__.py
@@ -2,4 +2,4 @@
 Useful classes and functionality for building and testing XBlocks
 """
 
-__version__ = '3.1.0'
+__version__ = '3.2.0'
diff --git a/xblockutils/public/studio_edit.js b/xblockutils/public/studio_edit.js
index d2ac7cb..499319c 100644
--- a/xblockutils/public/studio_edit.js
+++ b/xblockutils/public/studio_edit.js
@@ -51,17 +51,18 @@ function StudioEditableXBlockMixin(runtime, element) {
         if (type == 'html' && tinyMceAvailable) {
             tinyMCE.baseURL = baseUrl + "/js/vendor/tinymce/js/tinymce";
             $field.tinymce({
-                theme: 'modern',
-                skin: 'studio-tmce4',
+                theme: 'silver',
+                skin: 'studio-tmce5',
+                content_css: 'studio-tmce5',
                 height: '200px',
                 formats: { code: { inline: 'code' } },
                 codemirror: { path: "" + baseUrl + "/js/vendor" },
                 convert_urls: false,
-                plugins: "link codemirror",
+                plugins: "lists, link, codemirror",
                 menubar: false,
                 statusbar: false,
                 toolbar_items_size: 'small',
-                toolbar: "formatselect | styleselect | bold italic underline forecolor wrapAsCode | bullist numlist outdent indent blockquote | link unlink | code",
+                toolbar: "formatselect | styleselect | bold italic underline forecolor | bullist numlist outdent indent blockquote | link unlink | code",
                 resize: "both",
                 extended_valid_elements : 'i[class],span[class]',
                 setup : function(ed) {