diff --git a/shared/tinymce/toolbar.js b/shared/tinymce/toolbar.js
index 647985ddacffdf..096fd64e26f0ff 100644
--- a/shared/tinymce/toolbar.js
+++ b/shared/tinymce/toolbar.js
@@ -1,5 +1,5 @@
 ( function( tinymce ) {
-	tinymce.ui.svgbutton = tinymce.ui.Button.extend( {
+	tinymce.ui.Factory.add( 'svgbutton', tinymce.ui.Button.extend( {
 		renderHtml: function() {
 			var id = this._id;
 			var prefix = this.classPrefix;
@@ -53,7 +53,7 @@
 		active: function( isActive ) {
 			this.$( this.getEl() ).toggleClass( 'is-active', isActive );
 		}
-	} );
+	} ) );
 
 	tinymce.PluginManager.add( 'toolbar', function( editor ) {
 		var each = tinymce.each;
diff --git a/shared/tinymce/wplink.js b/shared/tinymce/wplink.js
index 18c4ab8e495c9d..4bec22f575fa22 100644
--- a/shared/tinymce/wplink.js
+++ b/shared/tinymce/wplink.js
@@ -1,5 +1,5 @@
 ( function( tinymce ) {
-	tinymce.ui.WPLinkPreview = tinymce.ui.Control.extend( {
+	tinymce.ui.Factory.add( 'WPLinkPreview', tinymce.ui.Control.extend( {
 		url: '#',
 		renderHtml: function() {
 			return (
@@ -50,9 +50,9 @@
 				tinymce.$( this.getEl().firstChild ).attr( 'href', this.url ).text( url );
 			}
 		}
-	} );
+	} ) );
 
-	tinymce.ui.WPLinkInput = tinymce.ui.Control.extend( {
+	tinymce.ui.Factory.add( 'WPLinkInput', tinymce.ui.Control.extend( {
 		renderHtml: function() {
 			return (
 				'<div id="' + this._id + '" class="wp-link-input">' +
@@ -82,7 +82,7 @@
 			urlInput.value = '';
 			urlInput.nextSibling.value = '';
 		}
-	} );
+	} ) );
 
 	tinymce.PluginManager.add( 'wplink', function( editor ) {
 		var toolbar;
diff --git a/tinymce-single/index.html b/tinymce-single/index.html
index 58b31a283c22ac..5aa6fe40f1a151 100644
--- a/tinymce-single/index.html
+++ b/tinymce-single/index.html
@@ -67,7 +67,7 @@ <h2>NASA discovers system of seven Earth-sized planets</h2>
 
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.5.5/tinymce.min.js"></script>
+		<script src="https://fiddle.azurewebsites.net/tinymce/nightly/tinymce.min.js"></script>
 
 		<script src="blocks.js"></script>
 		<script src="blocks/core/image/register.js"></script>
diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
index 47df456014a76f..1d7fab8c616b31 100644
--- a/tinymce-single/tinymce/block.js
+++ b/tinymce-single/tinymce/block.js
@@ -204,7 +204,8 @@
 			function createInsertToolbar() {
 				var insert = editor.wp._createToolbar( [ 'add' ] );
 
-				insert.$el.addClass( 'block-toolbar insert-toolbar' );
+				insert.$el.addClass( 'block-toolbar' );
+				insert.$el.addClass( 'insert-toolbar' );
 
 				insert.reposition = function ( settings ) {
 					settings = settings || {};
@@ -242,13 +243,13 @@
 				return insert;
 			}
 
-			window.tinymce.ui.WPInsertSeparator = tinymce.ui.Control.extend( {
+			tinymce.ui.Factory.add( 'WPInsertSeparator', tinymce.ui.Control.extend( {
 				renderHtml: function() {
 					return (
 						'<div id="' + this._id + '" class="insert-separator">' + this.settings.text + '</div>'
 					);
 				}
-			} );
+			} ) );
 
 			function createInsertMenu() {
 				var insertMenu = editor.wp._createToolbar( ( function() {