diff --git a/screenfetch-dev b/screenfetch-dev
index 4b7c8a8..cf908a8 100755
--- a/screenfetch-dev
+++ b/screenfetch-dev
@@ -1120,9 +1120,9 @@ themeExport () {
 
 for i in "${display[@]}"; do
 
-	if [[ $i == wmtheme ]]; then
-		detectwm
-		detectwmtheme
+	if [[ $i =~ wm ]]; then
+		 ! [[ $WM  ]] && detectwm; 
+		 ! [[ $Win_theme ]] && detectwmtheme;
 	else
 	
 	  [[ "${display[*]}" =~ "$i" ]] && detect${i}