diff --git a/inxi b/inxi
index c7a415d..30d82e4 100755
--- a/inxi
+++ b/inxi
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################
 ####  Script Name: inxi
-####  version: 1.8.16
+####  version: 1.8.17
 ####  Date: September 16 2012
 ####  Patch Number: 00
 ########################################################################
@@ -3256,7 +3256,9 @@ get_desktop_environment()
 
 	# note that cinnamon split from gnome, and and can now be id'ed via xprop,
 	# but it will still trigger the next gnome true case, so this needs to go before gnome test
-	if [[ -n $( grep -is '^_MUFFIN' <<< "$xprop_root" ) ]];then
+	# eventually this needs to be better organized so all the xprop tests are in the same
+	# section, but this is good enough for now.
+	if [[ -n $xprop_root && -n $( grep -is '^_MUFFIN' <<< "$xprop_root" ) ]];then
 		version=$( get_de_app_version 'cinnamon' '^cinnamon' '2' )
 		# not certain cinn will always have version, so keep output right if not
 		if [[ -n $version ]];then
@@ -3269,6 +3271,19 @@ get_desktop_environment()
 			fi
 		fi
 		desktop_environment="Cinnamon"
+	elif [[ -n $xprop_root && -n $( grep -is '^_MARCO' <<< "$xprop_root" ) ]];then
+		version=$( get_de_app_version 'mate-about' '^MATE[[:space:]]DESKTOP' 'NF' )
+		# not certain cinn/mate will always have version, so keep output right if not
+		if [[ -n $version ]];then
+			version="$version "
+		fi
+		if [[ $B_EXTRA_DATA == 'true' ]];then
+			toolkit=$( get_de_gtk_data )
+			if [[ -n $toolkit ]];then
+				version="${version}(Gtk ${toolkit})"
+			fi
+		fi
+		desktop_environment="MATE"
 	# note, GNOME_DESKTOP_SESSION_ID is deprecated so we'll see how that works out
 	# https://bugzilla.gnome.org/show_bug.cgi?id=542880
 	elif [[ -n $GNOME_DESKTOP_SESSION_ID ]]; then
@@ -3434,8 +3449,9 @@ get_de_app_version()
 {
 	local version_data='' version='' get_version='--version' 
 	
+	# mate-about -v = MATE Desktop Environment 1.4.0
 	case $1 in
-		dwm|jwm|wmii)
+		dwm|jwm|mate-about|wmii)
 			get_version='-v'
 			;;
 	esac
@@ -3497,7 +3513,10 @@ get_de_gtk_data()
 	local toolkit=''
 	
 	# this is a hack, and has to be changed with every toolkit version change
-	toolkit=$( pkg-config --modversion gtk+-3.0 2>/dev/null )
+	toolkit=$( pkg-config --modversion gtk+-4.0 2>/dev/null )
+	if [[ -z $toolkit ]];then
+		toolkit=$( pkg-config --modversion gtk+-3.0 2>/dev/null )
+	fi
 	if [[ -z $toolkit ]];then
 		toolkit=$( pkg-config --modversion gtk+-2.0 2>/dev/null )
 	fi