diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 20fb053462..11e0dc48ae 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -71,8 +71,7 @@
 		<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.DesktopContext.css">
 
 		<!-- visualEditor.theme.apex -->
-		<link rel=stylesheet href="lib/ve/src/themes/apex/dialogs.css">
-		<link rel=stylesheet href="lib/ve/src/themes/apex/widgets.css">
+		<link rel=stylesheet href="lib/ve/src/themes/apex.css">
 
 		<!-- example styles -->
 		<style>
diff --git a/extension.json b/extension.json
index 205a7e57a6..063e2bff42 100644
--- a/extension.json
+++ b/extension.json
@@ -958,16 +958,13 @@
 			],
 			"skinStyles": {
 				"vector": [
-					"lib/ve/src/themes/wikimediaui/dialogs.css",
-					"lib/ve/src/themes/wikimediaui/widgets.css"
+					"lib/ve/src/themes/wikimediaui.css"
 				],
 				"apex": [
-					"lib/ve/src/themes/apex/dialogs.css",
-					"lib/ve/src/themes/apex/widgets.css"
+					"lib/ve/src/themes/apex.css"
 				],
 				"monobook": [
-					"lib/ve/src/themes/apex/dialogs.css",
-					"lib/ve/src/themes/apex/widgets.css"
+					"lib/ve/src/themes/apex.css"
 				]
 			},
 			"dependencies": [
@@ -1326,10 +1323,10 @@
 			],
 			"skinStyles": {
 				"vector": [
-					"modules/ve-mw/themes/wikimediaui/widgets.css"
+					"modules/ve-mw/themes/wikimediaui.css"
 				],
 				"monobook": [
-					"modules/ve-mw/themes/apex/widgets.css"
+					"modules/ve-mw/themes/apex.css"
 				]
 			},
 			"dependencies": [
diff --git a/lib/ve b/lib/ve
index 320f015897..4922429f7b 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 320f015897c1a31837367324bc2d39e83a836d3d
+Subproject commit 4922429f7bf7d091e80e623b5844bc72d7934b2d
diff --git a/modules/ve-mw/themes/apex/widgets.css b/modules/ve-mw/themes/apex.css
similarity index 90%
rename from modules/ve-mw/themes/apex/widgets.css
rename to modules/ve-mw/themes/apex.css
index a1a9c393e2..c89c592f63 100644
--- a/modules/ve-mw/themes/apex/widgets.css
+++ b/modules/ve-mw/themes/apex.css
@@ -1,5 +1,5 @@
 /*!
- * VisualEditor Apex theme widget customizations.
+ * VisualEditor Apex theme customizations.
  *
  * @copyright 2011-2018 VisualEditor Team and others; see http://ve.mit-license.org
  */
diff --git a/modules/ve-mw/themes/wikimediaui/widgets.css b/modules/ve-mw/themes/wikimediaui.css
similarity index 89%
rename from modules/ve-mw/themes/wikimediaui/widgets.css
rename to modules/ve-mw/themes/wikimediaui.css
index f7c767fb48..f413e2893a 100644
--- a/modules/ve-mw/themes/wikimediaui/widgets.css
+++ b/modules/ve-mw/themes/wikimediaui.css
@@ -1,5 +1,5 @@
 /*!
- * VisualEditor MediaWiki theme widget customizations.
+ * VisualEditor MediaWiki theme customizations.
  *
  * @copyright 2011-2018 VisualEditor Team and others; see http://ve.mit-license.org
  */