3 files changed, 172 insertions, 124 deletions

diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index ed66c47dee1c..46e6123fae4a 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.4.3
-PORTREVISION=	0
+PORTVERSION=	4.6.0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfwm4-${PORTVERSION}
@@ -24,7 +23,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv libmcs libutil libgui mcsmanager panel
+USE_XFCE=	configenv libutil libgui panel xfconf
 
 OPTIONS=	COMPOSITE	"Support the experimental X11 Composite extension"	on \
 		STARTUP 	"Enable startup notification support"			on \
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 49cce2f1e0cf..7a937b6b5599 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfwm4-4.4.3.tar.bz2) = d15089f06187c029aee4cb87f75c302d
-SHA256 (xfce4/xfwm4-4.4.3.tar.bz2) = 12ee2e6bea8896f418905d6b93ce4a585aa22990bae9c1f89ca3cd56c608be51
-SIZE (xfce4/xfwm4-4.4.3.tar.bz2) = 1590866
+MD5 (xfce4/xfwm4-4.6.0.tar.bz2) = 83cd2f82f2fabfe4ab28a9780fbf309e
+SHA256 (xfce4/xfwm4-4.6.0.tar.bz2) = a82d4204639d63652bb306ccd70eb79b3c2ccf640cbd7ed6d032f7ee3dee9516
+SIZE (xfce4/xfwm4-4.6.0.tar.bz2) = 1792953
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 1f64b6cc66df..87c14381042a 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -1,13 +1,8 @@
 bin/xfwm4
-lib/xfce4/mcs-plugins/wmtweaks_plugin.a
-lib/xfce4/mcs-plugins/wmtweaks_plugin.la
-lib/xfce4/mcs-plugins/wmtweaks_plugin.so
-lib/xfce4/mcs-plugins/workspaces_plugin.a
-lib/xfce4/mcs-plugins/workspaces_plugin.la
-lib/xfce4/mcs-plugins/workspaces_plugin.so
-lib/xfce4/mcs-plugins/xfwm4_plugin.a
-lib/xfce4/mcs-plugins/xfwm4_plugin.la
-lib/xfce4/mcs-plugins/xfwm4_plugin.so
+bin/xfwm4-settings
+bin/xfwm4-tweaks-settings
+bin/xfwm4-workspace-settings
+libexec/xfce4/xfwm4/helper-dialog
 share/applications/xfce-wm-settings.desktop
 share/applications/xfce-wmtweaks-settings.desktop
 share/applications/xfce-workspaces-settings.desktop
@@ -62,6 +57,7 @@ share/locale/pt_PT/LC_MESSAGES/xfwm4.mo
 share/locale/ro/LC_MESSAGES/xfwm4.mo
 share/locale/ru/LC_MESSAGES/xfwm4.mo
 share/locale/sk/LC_MESSAGES/xfwm4.mo
+share/locale/sq/LC_MESSAGES/xfwm4.mo
 share/locale/sv/LC_MESSAGES/xfwm4.mo
 share/locale/ta/LC_MESSAGES/xfwm4.mo
 share/locale/tr/LC_MESSAGES/xfwm4.mo
@@ -174,6 +170,24 @@ share/themes/Daloa/xfwm4/top-right-active.png
 share/themes/Daloa/xfwm4/top-right-active.xpm
 share/themes/Daloa/xfwm4/top-right-inactive.png
 share/themes/Daloa/xfwm4/top-right-inactive.xpm
+share/themes/Daloa/xfwm4/close-prelight.xpm
+share/themes/Daloa/xfwm4/hide-prelight.xpm
+share/themes/Daloa/xfwm4/maximize-prelight.xpm
+share/themes/Daloa/xfwm4/maximize-toggled-prelight.xpm
+share/themes/Daloa/xfwm4/menu-prelight.xpm
+share/themes/Daloa/xfwm4/shade-prelight.xpm
+share/themes/Daloa/xfwm4/shade-toggled-prelight.xpm
+share/themes/Daloa/xfwm4/stick-prelight.xpm
+share/themes/Daloa/xfwm4/stick-toggled-prelight.xpm
+share/themes/Daloa/xfwm4/close-prelight.png
+share/themes/Daloa/xfwm4/hide-prelight.png
+share/themes/Daloa/xfwm4/maximize-prelight.png
+share/themes/Daloa/xfwm4/maximize-toggled-prelight.png
+share/themes/Daloa/xfwm4/menu-prelight.png
+share/themes/Daloa/xfwm4/shade-prelight.png
+share/themes/Daloa/xfwm4/shade-toggled-prelight.png
+share/themes/Daloa/xfwm4/stick-prelight.png
+share/themes/Daloa/xfwm4/stick-toggled-prelight.png
 share/themes/Default-4.0/xfwm4/README
 share/themes/Default-4.0/xfwm4/bottom-active.xpm
 share/themes/Default-4.0/xfwm4/bottom-inactive.xpm
@@ -313,6 +327,110 @@ share/themes/Default-4.2/xfwm4/top-right-active.png
 share/themes/Default-4.2/xfwm4/top-right-active.xpm
 share/themes/Default-4.2/xfwm4/top-right-inactive.png
 share/themes/Default-4.2/xfwm4/top-right-inactive.xpm
+share/themes/Default-4.4/xfwm4/README
+share/themes/Default-4.4/xfwm4/themerc
+share/themes/Default-4.4/xfwm4/bottom-active.xpm
+share/themes/Default-4.4/xfwm4/bottom-inactive.xpm
+share/themes/Default-4.4/xfwm4/bottom-left-active.xpm
+share/themes/Default-4.4/xfwm4/bottom-left-inactive.xpm
+share/themes/Default-4.4/xfwm4/bottom-right-active.xpm
+share/themes/Default-4.4/xfwm4/bottom-right-inactive.xpm
+share/themes/Default-4.4/xfwm4/close-active.xpm
+share/themes/Default-4.4/xfwm4/close-inactive.xpm
+share/themes/Default-4.4/xfwm4/close-pressed.xpm
+share/themes/Default-4.4/xfwm4/hide-active.xpm
+share/themes/Default-4.4/xfwm4/hide-inactive.xpm
+share/themes/Default-4.4/xfwm4/hide-pressed.xpm
+share/themes/Default-4.4/xfwm4/left-active.xpm
+share/themes/Default-4.4/xfwm4/left-inactive.xpm
+share/themes/Default-4.4/xfwm4/maximize-active.xpm
+share/themes/Default-4.4/xfwm4/maximize-inactive.xpm
+share/themes/Default-4.4/xfwm4/maximize-pressed.xpm
+share/themes/Default-4.4/xfwm4/maximize-toggled-active.xpm
+share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default-4.4/xfwm4/menu-active.xpm
+share/themes/Default-4.4/xfwm4/menu-inactive.xpm
+share/themes/Default-4.4/xfwm4/menu-pressed.xpm
+share/themes/Default-4.4/xfwm4/right-active.xpm
+share/themes/Default-4.4/xfwm4/right-inactive.xpm
+share/themes/Default-4.4/xfwm4/shade-active.xpm
+share/themes/Default-4.4/xfwm4/shade-inactive.xpm
+share/themes/Default-4.4/xfwm4/shade-pressed.xpm
+share/themes/Default-4.4/xfwm4/shade-toggled-active.xpm
+share/themes/Default-4.4/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default-4.4/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default-4.4/xfwm4/stick-active.xpm
+share/themes/Default-4.4/xfwm4/stick-inactive.xpm
+share/themes/Default-4.4/xfwm4/stick-pressed.xpm
+share/themes/Default-4.4/xfwm4/stick-toggled-active.xpm
+share/themes/Default-4.4/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default-4.4/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default-4.4/xfwm4/title-1-active.xpm
+share/themes/Default-4.4/xfwm4/title-1-inactive.xpm
+share/themes/Default-4.4/xfwm4/title-2-active.xpm
+share/themes/Default-4.4/xfwm4/title-2-inactive.xpm
+share/themes/Default-4.4/xfwm4/title-3-active.xpm
+share/themes/Default-4.4/xfwm4/title-3-inactive.xpm
+share/themes/Default-4.4/xfwm4/title-4-active.xpm
+share/themes/Default-4.4/xfwm4/title-4-inactive.xpm
+share/themes/Default-4.4/xfwm4/title-5-active.xpm
+share/themes/Default-4.4/xfwm4/title-5-inactive.xpm
+share/themes/Default-4.4/xfwm4/top-left-active.xpm
+share/themes/Default-4.4/xfwm4/top-left-inactive.xpm
+share/themes/Default-4.4/xfwm4/top-right-active.xpm
+share/themes/Default-4.4/xfwm4/top-right-inactive.xpm
+share/themes/Default-4.4/xfwm4/bottom-active.png
+share/themes/Default-4.4/xfwm4/bottom-inactive.png
+share/themes/Default-4.4/xfwm4/bottom-left-active.png
+share/themes/Default-4.4/xfwm4/bottom-left-inactive.png
+share/themes/Default-4.4/xfwm4/bottom-right-active.png
+share/themes/Default-4.4/xfwm4/bottom-right-inactive.png
+share/themes/Default-4.4/xfwm4/close-active.png
+share/themes/Default-4.4/xfwm4/close-inactive.png
+share/themes/Default-4.4/xfwm4/close-pressed.png
+share/themes/Default-4.4/xfwm4/hide-active.png
+share/themes/Default-4.4/xfwm4/hide-inactive.png
+share/themes/Default-4.4/xfwm4/hide-pressed.png
+share/themes/Default-4.4/xfwm4/left-active.png
+share/themes/Default-4.4/xfwm4/left-inactive.png
+share/themes/Default-4.4/xfwm4/maximize-active.png
+share/themes/Default-4.4/xfwm4/maximize-inactive.png
+share/themes/Default-4.4/xfwm4/maximize-pressed.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-active.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/menu-active.png
+share/themes/Default-4.4/xfwm4/menu-inactive.png
+share/themes/Default-4.4/xfwm4/menu-pressed.png
+share/themes/Default-4.4/xfwm4/right-active.png
+share/themes/Default-4.4/xfwm4/right-inactive.png
+share/themes/Default-4.4/xfwm4/shade-active.png
+share/themes/Default-4.4/xfwm4/shade-inactive.png
+share/themes/Default-4.4/xfwm4/shade-pressed.png
+share/themes/Default-4.4/xfwm4/shade-toggled-active.png
+share/themes/Default-4.4/xfwm4/shade-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/shade-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/stick-active.png
+share/themes/Default-4.4/xfwm4/stick-inactive.png
+share/themes/Default-4.4/xfwm4/stick-pressed.png
+share/themes/Default-4.4/xfwm4/stick-toggled-active.png
+share/themes/Default-4.4/xfwm4/stick-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/stick-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/title-1-active.png
+share/themes/Default-4.4/xfwm4/title-1-inactive.png
+share/themes/Default-4.4/xfwm4/title-2-active.png
+share/themes/Default-4.4/xfwm4/title-2-inactive.png
+share/themes/Default-4.4/xfwm4/title-3-active.png
+share/themes/Default-4.4/xfwm4/title-3-inactive.png
+share/themes/Default-4.4/xfwm4/title-4-active.png
+share/themes/Default-4.4/xfwm4/title-4-inactive.png
+share/themes/Default-4.4/xfwm4/title-5-active.png
+share/themes/Default-4.4/xfwm4/title-5-inactive.png
+share/themes/Default-4.4/xfwm4/top-left-active.png
+share/themes/Default-4.4/xfwm4/top-left-inactive.png
+share/themes/Default-4.4/xfwm4/top-right-active.png
+share/themes/Default-4.4/xfwm4/top-right-inactive.png
 share/themes/Default/xfwm4/README
 share/themes/Default/xfwm4/bottom-active.png
 share/themes/Default/xfwm4/bottom-active.xpm
@@ -338,7 +456,6 @@ share/themes/Default/xfwm4/hide-inactive.png
 share/themes/Default/xfwm4/hide-inactive.xpm
 share/themes/Default/xfwm4/hide-pressed.png
 share/themes/Default/xfwm4/hide-pressed.xpm
-share/themes/Default/xfwm4/keythemerc
 share/themes/Default/xfwm4/left-active.png
 share/themes/Default/xfwm4/left-active.xpm
 share/themes/Default/xfwm4/left-inactive.png
@@ -418,110 +535,24 @@ share/themes/Default/xfwm4/top-right-active.png
 share/themes/Default/xfwm4/top-right-active.xpm
 share/themes/Default/xfwm4/top-right-inactive.png
 share/themes/Default/xfwm4/top-right-inactive.xpm
-share/themes/Katiola/xfwm4/README
-share/themes/Katiola/xfwm4/bottom-active.png
-share/themes/Katiola/xfwm4/bottom-active.xpm
-share/themes/Katiola/xfwm4/bottom-inactive.png
-share/themes/Katiola/xfwm4/bottom-inactive.xpm
-share/themes/Katiola/xfwm4/bottom-left-active.png
-share/themes/Katiola/xfwm4/bottom-left-active.xpm
-share/themes/Katiola/xfwm4/bottom-left-inactive.png
-share/themes/Katiola/xfwm4/bottom-left-inactive.xpm
-share/themes/Katiola/xfwm4/bottom-right-active.png
-share/themes/Katiola/xfwm4/bottom-right-active.xpm
-share/themes/Katiola/xfwm4/bottom-right-inactive.png
-share/themes/Katiola/xfwm4/bottom-right-inactive.xpm
-share/themes/Katiola/xfwm4/close-active.png
-share/themes/Katiola/xfwm4/close-active.xpm
-share/themes/Katiola/xfwm4/close-inactive.png
-share/themes/Katiola/xfwm4/close-inactive.xpm
-share/themes/Katiola/xfwm4/close-pressed.png
-share/themes/Katiola/xfwm4/close-pressed.xpm
-share/themes/Katiola/xfwm4/hide-active.png
-share/themes/Katiola/xfwm4/hide-active.xpm
-share/themes/Katiola/xfwm4/hide-inactive.png
-share/themes/Katiola/xfwm4/hide-inactive.xpm
-share/themes/Katiola/xfwm4/hide-pressed.png
-share/themes/Katiola/xfwm4/hide-pressed.xpm
-share/themes/Katiola/xfwm4/left-active.png
-share/themes/Katiola/xfwm4/left-active.xpm
-share/themes/Katiola/xfwm4/left-inactive.png
-share/themes/Katiola/xfwm4/left-inactive.xpm
-share/themes/Katiola/xfwm4/maximize-active.png
-share/themes/Katiola/xfwm4/maximize-active.xpm
-share/themes/Katiola/xfwm4/maximize-inactive.png
-share/themes/Katiola/xfwm4/maximize-inactive.xpm
-share/themes/Katiola/xfwm4/maximize-pressed.png
-share/themes/Katiola/xfwm4/maximize-pressed.xpm
-share/themes/Katiola/xfwm4/maximize-toggled-active.png
-share/themes/Katiola/xfwm4/maximize-toggled-active.xpm
-share/themes/Katiola/xfwm4/maximize-toggled-inactive.png
-share/themes/Katiola/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Katiola/xfwm4/maximize-toggled-pressed.png
-share/themes/Katiola/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Katiola/xfwm4/menu-active.png
-share/themes/Katiola/xfwm4/menu-active.xpm
-share/themes/Katiola/xfwm4/menu-inactive.png
-share/themes/Katiola/xfwm4/menu-inactive.xpm
-share/themes/Katiola/xfwm4/menu-pressed.png
-share/themes/Katiola/xfwm4/menu-pressed.xpm
-share/themes/Katiola/xfwm4/right-active.png
-share/themes/Katiola/xfwm4/right-active.xpm
-share/themes/Katiola/xfwm4/right-inactive.png
-share/themes/Katiola/xfwm4/right-inactive.xpm
-share/themes/Katiola/xfwm4/shade-active.png
-share/themes/Katiola/xfwm4/shade-active.xpm
-share/themes/Katiola/xfwm4/shade-inactive.png
-share/themes/Katiola/xfwm4/shade-inactive.xpm
-share/themes/Katiola/xfwm4/shade-pressed.png
-share/themes/Katiola/xfwm4/shade-pressed.xpm
-share/themes/Katiola/xfwm4/shade-toggled-active.png
-share/themes/Katiola/xfwm4/shade-toggled-active.xpm
-share/themes/Katiola/xfwm4/shade-toggled-inactive.png
-share/themes/Katiola/xfwm4/shade-toggled-inactive.xpm
-share/themes/Katiola/xfwm4/shade-toggled-pressed.png
-share/themes/Katiola/xfwm4/shade-toggled-pressed.xpm
-share/themes/Katiola/xfwm4/stick-active.png
-share/themes/Katiola/xfwm4/stick-active.xpm
-share/themes/Katiola/xfwm4/stick-inactive.png
-share/themes/Katiola/xfwm4/stick-inactive.xpm
-share/themes/Katiola/xfwm4/stick-pressed.png
-share/themes/Katiola/xfwm4/stick-pressed.xpm
-share/themes/Katiola/xfwm4/stick-toggled-active.png
-share/themes/Katiola/xfwm4/stick-toggled-active.xpm
-share/themes/Katiola/xfwm4/stick-toggled-inactive.png
-share/themes/Katiola/xfwm4/stick-toggled-inactive.xpm
-share/themes/Katiola/xfwm4/stick-toggled-pressed.png
-share/themes/Katiola/xfwm4/stick-toggled-pressed.xpm
-share/themes/Katiola/xfwm4/themerc
-share/themes/Katiola/xfwm4/title-1-active.png
-share/themes/Katiola/xfwm4/title-1-active.xpm
-share/themes/Katiola/xfwm4/title-1-inactive.png
-share/themes/Katiola/xfwm4/title-1-inactive.xpm
-share/themes/Katiola/xfwm4/title-2-active.png
-share/themes/Katiola/xfwm4/title-2-active.xpm
-share/themes/Katiola/xfwm4/title-2-inactive.png
-share/themes/Katiola/xfwm4/title-2-inactive.xpm
-share/themes/Katiola/xfwm4/title-3-active.png
-share/themes/Katiola/xfwm4/title-3-active.xpm
-share/themes/Katiola/xfwm4/title-3-inactive.png
-share/themes/Katiola/xfwm4/title-3-inactive.xpm
-share/themes/Katiola/xfwm4/title-4-active.png
-share/themes/Katiola/xfwm4/title-4-active.xpm
-share/themes/Katiola/xfwm4/title-4-inactive.png
-share/themes/Katiola/xfwm4/title-4-inactive.xpm
-share/themes/Katiola/xfwm4/title-5-active.png
-share/themes/Katiola/xfwm4/title-5-active.xpm
-share/themes/Katiola/xfwm4/title-5-inactive.png
-share/themes/Katiola/xfwm4/title-5-inactive.xpm
-share/themes/Katiola/xfwm4/top-left-active.png
-share/themes/Katiola/xfwm4/top-left-active.xpm
-share/themes/Katiola/xfwm4/top-left-inactive.png
-share/themes/Katiola/xfwm4/top-left-inactive.xpm
-share/themes/Katiola/xfwm4/top-right-active.png
-share/themes/Katiola/xfwm4/top-right-active.xpm
-share/themes/Katiola/xfwm4/top-right-inactive.png
-share/themes/Katiola/xfwm4/top-right-inactive.xpm
+share/themes/Default/xfwm4/close-prelight.xpm
+share/themes/Default/xfwm4/hide-prelight.xpm
+share/themes/Default/xfwm4/maximize-prelight.xpm
+share/themes/Default/xfwm4/maximize-toggled-prelight.xpm
+share/themes/Default/xfwm4/menu-prelight.xpm
+share/themes/Default/xfwm4/shade-prelight.xpm
+share/themes/Default/xfwm4/shade-toggled-prelight.xpm
+share/themes/Default/xfwm4/stick-prelight.xpm
+share/themes/Default/xfwm4/stick-toggled-prelight.xpm
+share/themes/Default/xfwm4/close-prelight.png
+share/themes/Default/xfwm4/hide-prelight.png
+share/themes/Default/xfwm4/maximize-prelight.png
+share/themes/Default/xfwm4/maximize-toggled-prelight.png
+share/themes/Default/xfwm4/menu-prelight.png
+share/themes/Default/xfwm4/shade-prelight.png
+share/themes/Default/xfwm4/shade-toggled-prelight.png
+share/themes/Default/xfwm4/stick-prelight.png
+share/themes/Default/xfwm4/stick-toggled-prelight.png
 share/themes/Kokodi/xfwm4/README
 share/themes/Kokodi/xfwm4/themerc
 share/themes/Kokodi/xfwm4/bottom-active.xpm
@@ -626,6 +657,24 @@ share/themes/Kokodi/xfwm4/top-left-active.png
 share/themes/Kokodi/xfwm4/top-left-inactive.png
 share/themes/Kokodi/xfwm4/top-right-active.png
 share/themes/Kokodi/xfwm4/top-right-inactive.png
+share/themes/Kokodi/xfwm4/close-prelight.xpm
+share/themes/Kokodi/xfwm4/hide-prelight.xpm
+share/themes/Kokodi/xfwm4/maximize-prelight.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-prelight.xpm
+share/themes/Kokodi/xfwm4/menu-prelight.xpm
+share/themes/Kokodi/xfwm4/shade-prelight.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-prelight.xpm
+share/themes/Kokodi/xfwm4/stick-prelight.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-prelight.xpm
+share/themes/Kokodi/xfwm4/close-prelight.png
+share/themes/Kokodi/xfwm4/hide-prelight.png
+share/themes/Kokodi/xfwm4/maximize-prelight.png
+share/themes/Kokodi/xfwm4/maximize-toggled-prelight.png
+share/themes/Kokodi/xfwm4/menu-prelight.png
+share/themes/Kokodi/xfwm4/shade-prelight.png
+share/themes/Kokodi/xfwm4/shade-toggled-prelight.png
+share/themes/Kokodi/xfwm4/stick-prelight.png
+share/themes/Kokodi/xfwm4/stick-toggled-prelight.png
 share/themes/Moheli/xfwm4/README
 share/themes/Moheli/xfwm4/bottom-active.png
 share/themes/Moheli/xfwm4/bottom-active.xpm
@@ -1282,14 +1331,14 @@ share/xfce4/doc/it/xfwm4.html
 share/xfwm4/defaults
 @dirrmtry lib/xfce4/mcs-plugins
 @dirrmtry lib/xfce4
+@dirrm libexec/xfce4/xfwm4
+@dirrm libexec/xfce4
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/nb_NO/LC_MESSAGES
 @dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
 @dirrmtry share/xfce4/doc/C/images
 @dirrmtry share/xfce4/doc/C
 @dirrmtry share/xfce4/doc/fr/images
@@ -1306,8 +1355,8 @@ share/xfwm4/defaults
 @dirrmtry share/themes/Default-4.0
 @dirrm share/themes/Default-4.2/xfwm4
 @dirrmtry share/themes/Default-4.2
-@dirrm share/themes/Katiola/xfwm4
-@dirrmtry share/themes/Katiola
+@dirrm share/themes/Default-4.4/xfwm4
+@dirrmtry share/themes/Default-4.4
 @dirrm share/themes/Kokodi/xfwm4
 @dirrmtry share/themes/Kokodi
 @dirrm share/themes/Moheli/xfwm4