diff --git a/gui/Android.mk b/gui/Android.mk
index 2acbc92c..fa40e0fa 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -96,12 +96,10 @@ TWRP_RES_LOC := $(commands_recovery_local_path)/gui/devices/common/res
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), $(PORTRAIT)),)
+ ifneq ($(filter $(DEVICE_RESOLUTION), 320x480 480x800 480x854 540x960 720x1280 800x1280 1080x1920 1200x1920 1600x2560),)
TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/
- else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE)),)
+ else ifneq ($(filter $(DEVICE_RESOLUTION), 800x480 1024x600 1024x768 1280x800 1920x1200 2560x1600),)
TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/
endif
else
diff --git a/gui/devices/1440x2560/res/fonts/Roboto-Condensed-50.dat b/gui/devices/1440x2560/res/fonts/Roboto-Condensed-50.dat
deleted file mode 100644
index ae9c0f64..00000000
Binary files a/gui/devices/1440x2560/res/fonts/Roboto-Condensed-50.dat and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/back-icon.png b/gui/devices/1440x2560/res/images/back-icon.png
deleted file mode 100644
index 439ec19a..00000000
Binary files a/gui/devices/1440x2560/res/images/back-icon.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/checkbox_checked.png b/gui/devices/1440x2560/res/images/checkbox_checked.png
deleted file mode 100644
index 65d0b34d..00000000
Binary files a/gui/devices/1440x2560/res/images/checkbox_checked.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/checkbox_empty.png b/gui/devices/1440x2560/res/images/checkbox_empty.png
deleted file mode 100644
index 89b4c962..00000000
Binary files a/gui/devices/1440x2560/res/images/checkbox_empty.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/cursor.png b/gui/devices/1440x2560/res/images/cursor.png
deleted file mode 100644
index 32c8ae1c..00000000
Binary files a/gui/devices/1440x2560/res/images/cursor.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/curtain.jpg b/gui/devices/1440x2560/res/images/curtain.jpg
deleted file mode 100644
index c168882d..00000000
Binary files a/gui/devices/1440x2560/res/images/curtain.jpg and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/file.png b/gui/devices/1440x2560/res/images/file.png
deleted file mode 100644
index a69b6199..00000000
Binary files a/gui/devices/1440x2560/res/images/file.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/folder.png b/gui/devices/1440x2560/res/images/folder.png
deleted file mode 100644
index fbea7a97..00000000
Binary files a/gui/devices/1440x2560/res/images/folder.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/home-icon.png b/gui/devices/1440x2560/res/images/home-icon.png
deleted file mode 100644
index b9e40393..00000000
Binary files a/gui/devices/1440x2560/res/images/home-icon.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate001.png b/gui/devices/1440x2560/res/images/indeterminate001.png
deleted file mode 100644
index f5e16469..00000000
Binary files a/gui/devices/1440x2560/res/images/indeterminate001.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate002.png b/gui/devices/1440x2560/res/images/indeterminate002.png
deleted file mode 100644
index c841fb44..00000000
Binary files a/gui/devices/1440x2560/res/images/indeterminate002.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate003.png b/gui/devices/1440x2560/res/images/indeterminate003.png
deleted file mode 100644
index 651f9e7e..00000000
Binary files a/gui/devices/1440x2560/res/images/indeterminate003.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate004.png b/gui/devices/1440x2560/res/images/indeterminate004.png
deleted file mode 100644
index 21e9fca0..00000000
Binary files a/gui/devices/1440x2560/res/images/indeterminate004.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate005.png b/gui/devices/1440x2560/res/images/indeterminate005.png
deleted file mode 100644
index 1dd0172f..00000000
Binary files a/gui/devices/1440x2560/res/images/indeterminate005.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate006.png b/gui/devices/1440x2560/res/images/indeterminate006.png
deleted file mode 100644
index 4e5803ba..00000000
Binary files a/gui/devices/1440x2560/res/images/indeterminate006.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/keyboard1.png b/gui/devices/1440x2560/res/images/keyboard1.png
deleted file mode 100644
index 400f62db..00000000
Binary files a/gui/devices/1440x2560/res/images/keyboard1.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/keyboard2.png b/gui/devices/1440x2560/res/images/keyboard2.png
deleted file mode 100644
index 8b864a9b..00000000
Binary files a/gui/devices/1440x2560/res/images/keyboard2.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/keyboard3.png b/gui/devices/1440x2560/res/images/keyboard3.png
deleted file mode 100644
index be7ca477..00000000
Binary files a/gui/devices/1440x2560/res/images/keyboard3.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/keyboard4.png b/gui/devices/1440x2560/res/images/keyboard4.png
deleted file mode 100644
index 306c4b30..00000000
Binary files a/gui/devices/1440x2560/res/images/keyboard4.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/medium-button.png b/gui/devices/1440x2560/res/images/medium-button.png
deleted file mode 100644
index a3bf30d5..00000000
Binary files a/gui/devices/1440x2560/res/images/medium-button.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/menu-button.png b/gui/devices/1440x2560/res/images/menu-button.png
deleted file mode 100644
index d6510557..00000000
Binary files a/gui/devices/1440x2560/res/images/menu-button.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/minus-button.png b/gui/devices/1440x2560/res/images/minus-button.png
deleted file mode 100644
index e2edbe45..00000000
Binary files a/gui/devices/1440x2560/res/images/minus-button.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/plus-button.png b/gui/devices/1440x2560/res/images/plus-button.png
deleted file mode 100644
index 28fb825c..00000000
Binary files a/gui/devices/1440x2560/res/images/plus-button.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/progress_empty.png b/gui/devices/1440x2560/res/images/progress_empty.png
deleted file mode 100644
index 4d610c6b..00000000
Binary files a/gui/devices/1440x2560/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/progress_fill.png b/gui/devices/1440x2560/res/images/progress_fill.png
deleted file mode 100644
index 3860c241..00000000
Binary files a/gui/devices/1440x2560/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/radio_empty.png b/gui/devices/1440x2560/res/images/radio_empty.png
deleted file mode 100644
index 9c2c66bb..00000000
Binary files a/gui/devices/1440x2560/res/images/radio_empty.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/radio_selected.png b/gui/devices/1440x2560/res/images/radio_selected.png
deleted file mode 100644
index 8d05b9d4..00000000
Binary files a/gui/devices/1440x2560/res/images/radio_selected.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/slideout.png b/gui/devices/1440x2560/res/images/slideout.png
deleted file mode 100644
index a2f2be14..00000000
Binary files a/gui/devices/1440x2560/res/images/slideout.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/slider-touch.png b/gui/devices/1440x2560/res/images/slider-touch.png
deleted file mode 100644
index f6dac624..00000000
Binary files a/gui/devices/1440x2560/res/images/slider-touch.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/slider-used.png b/gui/devices/1440x2560/res/images/slider-used.png
deleted file mode 100644
index f18f8ce2..00000000
Binary files a/gui/devices/1440x2560/res/images/slider-used.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/slider.png b/gui/devices/1440x2560/res/images/slider.png
deleted file mode 100644
index 46fa928e..00000000
Binary files a/gui/devices/1440x2560/res/images/slider.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/sort-button.png b/gui/devices/1440x2560/res/images/sort-button.png
deleted file mode 100644
index c4f9edda..00000000
Binary files a/gui/devices/1440x2560/res/images/sort-button.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/tg_background.png b/gui/devices/1440x2560/res/images/tg_background.png
deleted file mode 100644
index 1576e7b6..00000000
Binary files a/gui/devices/1440x2560/res/images/tg_background.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/top-bar.jpg b/gui/devices/1440x2560/res/images/top-bar.jpg
deleted file mode 100755
index 93137b8c..00000000
Binary files a/gui/devices/1440x2560/res/images/top-bar.jpg and /dev/null differ
diff --git a/gui/devices/1440x2560/res/images/unlock.png b/gui/devices/1440x2560/res/images/unlock.png
deleted file mode 100644
index dc3894b7..00000000
Binary files a/gui/devices/1440x2560/res/images/unlock.png and /dev/null differ
diff --git a/gui/devices/1440x2560/res/ui.xml b/gui/devices/1440x2560/res/ui.xml
deleted file mode 100644
index fa78add5..00000000
--- a/gui/devices/1440x2560/res/ui.xml
+++ /dev/null
@@ -1,417 +0,0 @@
-
-
-
-
-
- TeamWin
- Backup Naowz
- Default basic theme
- preview.jpg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index 6a3618e6..466c64bb 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -1387,7 +1387,7 @@