diff --git a/gui/Android.mk b/gui/Android.mk
index fa40e0f..2acbc92 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -96,10 +96,12 @@
 TWRP_COMMON_XML := $(hide) echo "No common TWRP XML resources"
 
 ifeq ($(TW_CUSTOM_THEME),)
+	PORTRAIT := 320x480 480x800 480x854 540x960 720x1280 800x1280 1080x1920 1200x1920 1440x2560 1600x2560
+	LANDSCAPE := 800x480 1024x600 1024x768 1280x800 1920x1200 2560x1600
 	TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)/res
-	ifneq ($(filter $(DEVICE_RESOLUTION), 320x480 480x800 480x854 540x960 720x1280 800x1280 1080x1920 1200x1920 1600x2560),)
+	ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT)),)
 		TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/
-	else ifneq ($(filter $(DEVICE_RESOLUTION), 800x480 1024x600 1024x768 1280x800 1920x1200 2560x1600),)
+	else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE)),)
 		TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/
 	endif
 else