diff --git a/data/other/enlightenment_remote b/data/other/enlightenment_remote
index 90aad56d0..b1dc0b69b 100644
--- a/data/other/enlightenment_remote
+++ b/data/other/enlightenment_remote
@@ -25,7 +25,6 @@ _enlightenment_remote() {
 	CONTEXT="NONE BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY"
 	MODIFIERS="NONE SHIFT| SHIFT CONTROL| CONTROL ALT| ALT WIN| WIN"
 	DIRS="data images fonts themes init icons modules backgrounds"
-	THEME_CATEGORIES="theme"
 
 
 	case "${action}" in
@@ -222,18 +221,25 @@ _enlightenment_remote() {
 		return 0
 		;;
 	-theme-get|-theme-remove)
-		COMPREPLY=($(compgen -W "${THEME_CATEGORIES}" -- "${cur}"))
+		theme_categories=$(enlightenment_remote -theme-category-list|grep REPLY:|awk '{print $2}')
+		COMPREPLY=($(compgen -W "${theme_categories}" -- "${cur}"))
 		return 0
 		;;
 	-theme-set)
 		if [[ ${COMP_CWORD} -eq 2 ]]; then
-			COMPREPLY=($(compgen -W "${THEME_CATEGORIES}" -- "${cur}"))
+			theme_categories=$(enlightenment_remote -theme-category-list|grep REPLY:|awk '{print $2}')
+			COMPREPLY=($(compgen -W "${theme_categories}" -- "${cur}"))
 		elif [[ ${COMP_CWORD} -eq 3 ]]; then
 			# TODO Add filename expansion, and only match dirs and .edj files
 			COMPREPLY=()
 		fi
 		return 0
 		;;
+	-transition-*-set)
+		transitions=$(enlightenment_remote -transition-list|grep REPLY:|awk '{print $2}')
+		COMPREPLY=($(compgen -W "${transitions}" -- "${cur}"))
+		return 0
+		;;
 	-window-placement-policy-set)
 		COMPREPLY=($(compgen -W "SMART CURSOR MANUAL" -- "${cur}"))
 		return 0