Index: wp-includes/css/editor.css
===================================================================
--- wp-includes/css/editor.css	(revision 27181)
+++ wp-includes/css/editor.css	(working copy)
@@ -2,6 +2,108 @@
  TinyMCE and Quicklinks toolbars
 ------------------------------------------------------------------------------*/
 
+/* TinyMCE widgets/containers */
+
+.mce-container,
+.mce-container *,
+.mce-widget,
+.mce-widget * {
+	color: inherit;
+	font-family: inherit;
+}
+
+/* TinyMCE windows */
+
+#mce-modal-block.mce-in {
+	opacity: 0.7;
+	z-index: 159900!important; /* Overwrite inline style added by TinyMCE. */
+}
+
+.mce-window {
+	border-radius: 0;
+	box-shadow: 0 5px 15px rgba(0,0,0,0.7);
+	z-index: 160000!important; /* Overwrite inline style added by TinyMCE. */
+	-webkit-font-smoothing: subpixel-antialiased;
+}
+
+.mce-window .mce-container-body.mce-abs-layout {
+	overflow: visible;
+}
+
+.mce-window iframe {
+	margin-top: -1px;
+}
+
+.mce-window-head {
+	background: #fcfcfc;
+	border-bottom: 1px solid #dfdfdf;
+	height: 56px;
+	padding: 0;
+}
+
+.mce-window-head .mce-title {
+	font-size: 22px;
+	font-weight: 600;
+	line-height: 56px;
+	margin: 0;
+	padding: 0 16px;
+}
+
+.mce-window-head .mce-close {
+	color: #666;
+	top: 15px;
+	width: 20px;
+}
+
+.mce-window-head .mce-close:hover {
+	color: #2ea2cc;
+}
+
+/* TinyMCE menus */
+
+.mce-menu,
+.mce-floatpanel.mce-popover {
+	border: none;
+	border-radius: 0;
+	box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
+}
+
+.mce-floatpanel.mce-popover.mce-bottom {
+	margin-top: 2px;
+}
+
+.mce-floatpanel .mce-arrow {
+	display: none;
+}
+
+.mce-menu {
+	min-width: 0;
+}
+
+.mce-menu-item {
+	border: none;
+	margin-bottom: 2px;
+}
+
+.mce-menu-item .mce-text {
+	color: inherit!important; /* Overwrite inline style added by TinyMCE. */
+}
+
+.mce-menu-item:hover {
+	background: #f3f3f3;
+	color: inherit;
+}
+
+.mce-menu-item.mce-active {
+	background: #2ea2cc;
+}
+
+.mce-menu-item.mce-active .mce-text {
+	color: #fff!important;
+}
+
+/* TinyMCE panel */
+
 div.mce-panel {
 	border: 0;
 	background: #fff;
@@ -9,6 +111,8 @@
 	filter: none;
 }
 
+/* TinyMCE toolbars */
+
 div.mce-toolbar-grp {
 	border-bottom: 1px solid #dedede;
 	background: #f5f5f5;
@@ -75,60 +179,80 @@
 }
 
 .mce-toolbar .mce-btn i {
-	text-shadow: 0;
+	text-shadow: none;
 }
 
 .mce-toolbar .mce-btn:focus {
 	outline: 1px solid #888;
 }
 
-.mce-toolbar .mce-btn-group .mce-btn.mce-listbox {
-	-webkit-border-radius: 0;
-	border-radius: 0;
-	direction: ltr;
-	background: #fff;
-	border: 1px solid #ddd;
-	-webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
-	box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
+.mce-toolbar .mce-btn .mce-open {
+	border-right: 0;
 }
 
-.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover {
-	background-image: none;
-	border-color: #bbb;
+.mce-toolbar .mce-colorbutton .mce-preview {
+	margin-left: -18px;
+	padding: 0;
+	width: 18px;
 }
 
-.mce-toolbar .mce-colorbutton .mce-open {
-	border-right: 0;
-}
+/* TinyMCE charmap */
 
-.mce-toolbar .mce-colorbutton .mce-preview {
-	margin-left: -16px;
+.mce-charmap {
+	margin: 8px;
 }
 
-/* Charmap modal */
 .mce-charmap td {
+	border-color: #dfdfdf;
+	cursor: pointer;
 	padding: 0;
 }
 
+.mce-charmap td:hover {
+	background: #f3f3f3;
+}
+
 .mce-charmap td div {
-	width: 18px;
 	height: 22px;
 	line-height: 22px;
+	width: 18px;
 }
 
-/* Icons */
-.mce-toolbar .mce-ico {
+/* TinyMCE tooltips */
+
+.mce-tooltip {
+	margin-top: 2px;
+}
+
+.mce-tooltip-inner {
+	box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
+	color: #fff;
+	font-size: 12px;
+}
+
+/* TinyMCE icons */
+
+.mce-toolbar .mce-ico,
+.mce-toolbar .mce-caret {
 	color: #777;
 	line-height: 20px;
 	width: 20px;
 	height: 20px;
 	text-align: center;
+	text-shadow: none;
 }
 
-.mce-toolbar .mce-btn:hover .mce-ico {
+.mce-toolbar .mce-btn:hover .mce-ico,
+.mce-toolbar .mce-btn.mce-active .mce-ico,
+.mce-toolbar .mce-btn:hover .mce-caret,
+.mce-toolbar .mce-btn.mce-active .mce-caret {
 	color: #333;
 }
 
+.mce-toolbar .mce-btn.mce-active .mce-open {
+	border-left-color: #bdbdbd;
+}
+
 i.mce-i-bold,
 i.mce-i-italic,
 i.mce-i-bullist,
@@ -160,7 +284,9 @@
 i.mce-i-wp_help,
 i.mce-i-wp-media-library,
 i.mce-i-ltr,
-i.mce-i-wp_page {
+i.mce-i-wp_page,
+i.mce-caret,
+.mce-close {
 	font: normal 20px/1 'dashicons';
 	padding: 0;
 	vertical-align: top;
@@ -287,6 +413,47 @@
 	content: '\f105';
 }
 
+i.mce-caret:before {
+	content: '\f140';
+}
+
+.mce-active i.mce-caret:before {
+	content: '\f142';
+}
+
+.mce-close:before {
+	content: '\f158';
+}
+
+.mce-toolbar .mce-caret {
+	border: none;
+	margin: 0;
+	margin-left: -5px;
+	width: 16px;
+}
+
+.mce-menubtn span {
+	margin-right: 0;
+	padding-left: 3px;
+}
+
+.mce-listbox .mce-caret {
+	margin-top: 0;
+	padding: 2px 3px;
+	right: 0;
+	top: 0;
+	width: 10px;
+}
+
+.mce-listbox:hover .mce-caret,
+.mce-listbox.mce-active .mce-caret {
+	border-left: 1px solid #bdbdbd;
+}
+
+.mce-listbox .mce-caret:before {
+	margin-left: -6px;
+}
+
 /* Editors */
 .wp-editor-wrap {
 	position: relative;
@@ -435,10 +602,6 @@
 .quicktags-toolbar {
 	border-bottom-style: solid;
 	border-bottom-width: 1px;
-	-webkit-border-top-right-radius: 3px;
-	border-top-right-radius: 3px;
-	-webkit-border-top-left-radius: 3px;
-	border-top-left-radius: 3px;
 	padding: 2px 8px 0;
 	min-height: 29px;
 }
@@ -1034,104 +1197,6 @@
 	filter: alpha(opacity=60);
 }
 
-/* TinyMCE modal */
-/* TODO: restyle the TinyMCE 4.0 modals
-.clearlooks2 .mceTop {
-	border-bottom: 1px solid #ccc;
-}
-
-.clearlooks2 .mceTop span {
-	font: 13px/24px "Open Sans", sans-serif;
-	color: #e5e5e5;
-}
-
-.clearlooks2 .mceTop .mceLeft {
-	background: #444444;
-	border-color: transparent;
-}
-
-.clearlooks2 .mceTop .mceRight {
-	background: #444444;
-	border-color: transparent;
-}
-
-.clearlooks2 .mceMiddle {
-	clip: rect(24px auto auto auto);
-}
-
-.clearlooks2 .mceMiddle .mceLeft {
-	background: #f1f1f1;
-	border-color: transparent;
-}
-
-.clearlooks2 .mceMiddle .mceRight {
-	background: #f1f1f1;
-	border-color: transparent;
-}
-
-.clearlooks2 .mceBottom {
-	background: #f1f1f1;
-	border-color: transparent;
-}
-
-.clearlooks2 .mceBottom .mceLeft {
-	background: #f1f1f1;
-	border-color: transparent;
-}
-
-.clearlooks2 .mceBottom .mceCenter {
-	background: #f1f1f1;
-	border-color: transparent;
-}
-
-.clearlooks2 .mceBottom .mceRight {
-	background: #f1f1f1;
-	border-color: transparent;
-}
-
-.clearlooks2 .mceClose,
-.clearlooks2 .mceFocus .mceClose,
-.clearlooks2 .mceFocus .mceClose:hover {
-	background-image: none;
-}
-.clearlooks2 .mceClose:before {
-	content: '\f158';
-	font: normal 20px/1 'dashicons';
-	speak: none;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	color: #999;
-	padding-left: 12px;
-}
-
-/* from colors.css
-.clearlooks2 {
-	box-shadow: 0 5px 15px rgba(0,0,0,0.7);
-}
-
-.clearlooks2 .mceMiddle span,
-.clearlooks2 .mceMiddle .mceLeft,
-.clearlooks2 .mceMiddle .mceRight,
-.clearlooks2 .mceBottom,
-.clearlooks2 .mceBottom .mceLeft,
-.clearlooks2 .mceBottom .mceCenter,
-.clearlooks2 .mceBottom .mceRight {
-	background-color: #fcfcfc;
-}
-
-.clearlooks2 .mceTop span,
-.clearlooks2 .mceFocus .mceTop span {
-	color: #222;
-}
-
-.clearlooks2 .mceClose:before {
-	color: #999;
-}
-
-.clearlooks2 .mceClose:hover:before {
-	color: #2ea2cc;
-}
-*/
 /* Distraction Free Writing mode
  * =Overlay Styles
 -------------------------------------------------------------- */
Index: wp-includes/js/tinymce/tiny_mce_popup.js
===================================================================
--- wp-includes/js/tinymce/tiny_mce_popup.js	(revision 27181)
+++ wp-includes/js/tinymce/tiny_mce_popup.js	(working copy)
@@ -43,8 +43,6 @@
 		if (settings.popup_css !== false) {
 			if (settings.popup_css) {
 				settings.popup_css = self.editor.documentBaseURI.toAbsolute(settings.popup_css);
-			} else {
-				settings.popup_css = self.editor.baseURI.toAbsolute("plugins/compat3x/css/dialog.css");
 			}
 		}
 
Index: wp-includes/js/tinymce/wp-mce-help.php
===================================================================
--- wp-includes/js/tinymce/wp-mce-help.php	(revision 27181)
+++ wp-includes/js/tinymce/wp-mce-help.php	(working copy)
@@ -15,140 +15,137 @@
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php _e('Rich Editor Help'); ?></title>
 <script type="text/javascript" src="tiny_mce_popup.js?ver=358-20121205"></script>
-<?php
-wp_admin_css( 'wp-admin', true );
-?>
+<?php wp_admin_css( 'wp-admin', true ); ?>
 <style type="text/css">
-	body {
-		min-width: 0;
+
+	html {
+		background: #fcfcfc;
+		overflow: hidden;
 	}
-	#wphead {
-		font-size: 80%;
-		border-top: 0;
-		color: #555;
-		background-color: #f1f1f1;
-	}
-	#wphead h1 {
-		font-size: 24px;
-		color: #555;
-		margin: 0;
-		padding: 10px;
+
+	#tabs-wrap {
+		height: 36px;
+		position: absolute;
+		top: 2px;
 	}
+
 	#tabs {
-		padding: 15px 15px 3px;
-		background-color: #f1f1f1;
-		border-bottom: 1px solid #dfdfdf;
+		box-shadow: 0 3px 5px rgba( 255, 255, 255, 0.2 );
 		margin: 0;
+		padding: 0 6px;
+		position: relative;
+		-webkit-user-select: none;
+		-moz-user-select: none;
+		-ms-user-select: none;
+		user-select: none;
 	}
-	#tabs li {
-		display: inline;
-	}
-	#tabs a.current {
-		background-color: #fff;
-		border-color: #dfdfdf;
-		border-bottom-color: #fff;
-		color: #d54e21;
-	}
+
 	#tabs a {
-		color: #2583AD;
-		padding: 6px;
-		border-width: 1px 1px 0;
-		border-style: solid solid none;
-		border-color: #f1f1f1;
+		-webkit-transition: none;
+		transition: none;
+	}
+	
+	#tabs > a {
+		float: left;
+		font-size: 14px;
+		height: 18px;
+		line-height: 18px;
+		margin: 0;
+		padding: 8px 10px 9px;
+		position: relative;
 		text-decoration: none;
 	}
-	#tabs a:hover {
-		color: #d54e21;
+
+	#tabs > a:last-child {
+		border-right: 0;
 	}
-	.wrap h2 {
-		border-bottom-color: #dfdfdf;
-		color: #555;
-		margin: 5px 0;
-		padding: 0;
-		font-size: 18px;
-	}
-	#user_info {
-		right: 5%;
-		top: 5px;
-	}
-	h3 {
-		font-size: 1.1em;
-		margin-top: 10px;
-		margin-bottom: 0px;
+
+	#tabs > a:active,
+	#tabs > a:focus {
+		outline: none;
 	}
+
+	#tabs .active,
+	#tabs .active:hover {
+		color: #333;
+	}
+
+	#tabs .active,
+	#tabs > a.active:last-child {
+		background: #fff;
+		border: 1px solid #ddd;
+		border-bottom: none;
+		margin: -1px -1px 0;
+	}
+
+	#tabs .active:after {
+		display: none;
+	}
+
 	#flipper {
-		margin: 0;
-		padding: 5px 20px 10px;
 		background-color: #fff;
-		border-left: 1px solid #dfdfdf;
-		border-bottom: 1px solid #dfdfdf;
-	}
-	* html {
-        overflow-x: hidden;
-        overflow-y: scroll;
-    }
-	#flipper div p {
-		margin-top: 0.4em;
-		margin-bottom: 0.8em;
-		text-align: justify;
+		border-top: 1px solid #ddd;
+		height: 360px;
+		margin: 0;
+		margin-top: 36px;
+		overflow-y: scroll;
+		padding: 10px 16px;
 	}
+
 	th {
 		text-align: center;
 	}
+
 	.top th {
 		text-decoration: underline;
 	}
+
 	.top .key {
 		text-align: center;
 		width: 5em;
 	}
-	.top .action {
-		text-align: left;
-	}
-	.align {
-		border-left: 3px double #333;
-		border-right: 3px double #333;
-	}
+
 	.keys {
+		border: 0 none;
 		margin-bottom: 15px;
 		width: 100%;
-		border: 0 none;
 	}
+
 	.keys p {
 		display: inline-block;
 		margin: 0px;
 		padding: 0px;
 	}
-	.keys .left { text-align: left; }
-	.keys .center { text-align: center; }
-	.keys .right { text-align: right; }
-	td b {
-		font-family: "Times New Roman" Times serif;
+
+	.keys .left {
+		text-align: left;
 	}
-	#buttoncontainer {
+
+	.keys .center {
 		text-align: center;
-		margin-bottom: 20px;
 	}
-	#buttoncontainer a, #buttoncontainer a:hover {
-		border-bottom: 0px;
+
+	.keys .right {
+		text-align: right;
 	}
+
 	.macos .win,
 	.windows .mac {
 		display: none;
 	}
+
 </style>
 <?php if ( is_rtl() ) : ?>
 <style type="text/css">
-	#wphead, #tabs {
-		padding-left: auto;
-		padding-right: 15px;
+
+	.keys .left {
+		text-align: right;
 	}
-	#flipper {
-		margin: 5px 0 3px 10px;
+
+	.keys .right {
+		text-align: left;
 	}
-	.keys .left, .top, .action { text-align: right; }
-	.keys .right { text-align: left; }
-	td b { font-family: Tahoma, "Times New Roman", Times, serif }
+
 </style>
 <?php endif; ?>
 </head>
@@ -158,12 +155,14 @@
 	document.body.className = document.body.className.replace(/windows/, 'macos');
 </script>
 
-<ul id="tabs">
-	<li><a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="current"><?php _e('Basics'); ?></a></li>
-	<li><a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a></li>
-	<li><a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a></li>
-	<li><a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a></li>
-</ul>
+<div id="tabs-wrap">
+	<div id="tabs">
+		<a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="active"><?php _e('Basics'); ?></a>
+		<a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a>
+		<a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a>
+		<a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a>
+	</div>
+</div>
 
 <div id="flipper" class="wrap">
 
@@ -172,7 +171,7 @@
 	<p><?php _e('<em>Rich editing</em>, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear approximately as they will on the internet.'); ?></p>
 	<p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However editing HTML is not the same as typing text. Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css. WordPress is producing valid XHTML 1.0 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.'); ?></p>
 	<p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+A = select all, etc. (on Mac use the Command key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.'); ?></p>
-    <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.'); ?></p>
+	<p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.'); ?></p>
 </div>
 
 <div id="content2" class="hidden">
@@ -189,7 +188,7 @@
 
 <div id="content3" class="hidden">
 	<h2><?php _e('Writing at Full Speed'); ?></h2>
-    <p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter.'); ?></p>
+	<p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter.'); ?></p>
 
 	<table class="keys">
 		<tr class="top"><th class="key center"><?php _e('Letter'); ?></th><th class="left"><?php _e('Action'); ?></th><th class="key center"><?php _e('Letter'); ?></th><th class="left"><?php _e('Action'); ?></th></tr>
@@ -228,19 +227,13 @@
 <div id="content4" class="hidden">
 	<h2><?php _e('About TinyMCE'); ?></h2>
 
-    <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
+	<p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
 	<p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor released as Open Source under %sLGPL</a>	by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/wp-includes/js/tinymce/license.txt').'" target="_blank" title="'.esc_attr__('GNU Library General Public License').'">'); ?></p>
 	<p><?php _e('Copyright &copy; 2003-2014, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.'); ?></p>
 	<p><?php _e('For more information about this software visit the <a href="http://tinymce.com" target="_blank">TinyMCE website</a>.'); ?></p>
 </div>
 
 </div>
-
-<div class="mceActionPanel">
-	<div style="margin: 8px auto; text-align: center;padding-bottom: 10px;">
-		<input type="button" id="cancel" name="cancel" value="<?php esc_attr_e('Close'); ?>" title="<?php esc_attr_e('Close'); ?>" onclick="tinyMCEPopup.close();" />
-	</div>
-</div>
 <script type="text/javascript">
 	function d(id) { return document.getElementById(id); }
 
@@ -252,7 +245,7 @@
 			t = d('tab'+i.toString());
 			if ( n == i ) {
 				c.className = '';
-				t.className = 'current';
+				t.className = 'active';
 			} else {
 				c.className = 'hidden';
 				t.className = '';
@@ -260,18 +253,18 @@
 		}
 	}
 
-    tinyMCEPopup.onInit.add(function() {
-        var win = tinyMCEPopup.getWin();
+	tinyMCEPopup.onInit.add(function() {
+		var win = tinyMCEPopup.getWin();
 
 		d('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
-        d('date').innerHTML = tinymce.releaseDate;
+		d('date').innerHTML = tinymce.releaseDate;
 
 		if ( win.fullscreen && win.fullscreen.settings.visible ) {
 			d('content1').className = 'hidden';
 			d('tabs').className = 'hidden';
 			d('content3').className = 'dfw';
 		}
-    });
+	});
 </script>
 </body>
 </html>