diff --git a/gui/Android.mk b/gui/Android.mk
index 61bd1022..51b296d1 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -92,9 +92,6 @@ LOCAL_MODULE := twrp
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
-TWRP_RES := $(commands_recovery_local_path)/gui/devices/common/res/*
-# enable this to use new themes:
-TWRP_NEW_THEME := true
ifeq ($(TW_CUSTOM_THEME),)
ifeq ($(TW_THEME),)
@@ -120,11 +117,10 @@ ifeq ($(TW_CUSTOM_THEME),)
endif
endif
-ifeq ($(TWRP_NEW_THEME),true)
- TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/theme/$(TW_THEME)
- TWRP_RES := $(commands_recovery_local_path)/gui/theme/common/fonts
- TWRP_RES += $(commands_recovery_local_path)/gui/theme/common/languages
- TWRP_RES += $(commands_recovery_local_path)/gui/theme/common/$(word 1,$(subst _, ,$(TW_THEME))).xml
+TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/theme/$(TW_THEME)
+TWRP_RES := $(commands_recovery_local_path)/gui/theme/common/fonts
+TWRP_RES += $(commands_recovery_local_path)/gui/theme/common/languages
+TWRP_RES += $(commands_recovery_local_path)/gui/theme/common/$(word 1,$(subst _, ,$(TW_THEME))).xml
ifeq ($(TW_EXTRA_LANGUAGES),true)
TWRP_RES += $(commands_recovery_local_path)/gui/theme/extra-languages/fonts
TWRP_RES += $(commands_recovery_local_path)/gui/theme/extra-languages/languages
@@ -142,28 +138,6 @@ ifeq ($(wildcard $(TWRP_THEME_LOC)/ui.xml),)
$(warning ****************************************************************************)
$(error stopping)
endif
-else
- TWRP_RES += $(commands_recovery_local_path)/gui/devices/$(word 1,$(subst _, ,$(TW_THEME)))/res/*
- ifeq ($(TW_THEME), portrait_mdpi)
- TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/480x800/res
- else ifeq ($(TW_THEME), portrait_hdpi)
- TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/1080x1920/res
- else ifeq ($(TW_THEME), watch_mdpi)
- TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/320x320/res
- else ifeq ($(TW_THEME), landscape_mdpi)
- TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/800x480/res
- else ifeq ($(TW_THEME), landscape_hdpi)
- TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/1920x1200/res
- else
- $(warning ****************************************************************************)
- $(warning * TW_THEME ($(TW_THEME)) is not valid.)
- $(warning * Please choose an appropriate TW_THEME or create a new one for your device.)
- $(warning * Valid options are portrait_mdpi portrait_hdpi watch_mdpi)
- $(warning * landscape_mdpi landscape_hdpi)
- $(warning ****************************************************************************)
- $(error stopping)
- endif
-endif
else
TWRP_THEME_LOC := $(TW_CUSTOM_THEME)
endif
diff --git a/gui/devices/1080x1920/res/images/back-icon.png b/gui/devices/1080x1920/res/images/back-icon.png
deleted file mode 100644
index 08e13b0f..00000000
Binary files a/gui/devices/1080x1920/res/images/back-icon.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/checkbox_checked.png b/gui/devices/1080x1920/res/images/checkbox_checked.png
deleted file mode 100644
index c1173de5..00000000
Binary files a/gui/devices/1080x1920/res/images/checkbox_checked.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/checkbox_empty.png b/gui/devices/1080x1920/res/images/checkbox_empty.png
deleted file mode 100644
index be5301f4..00000000
Binary files a/gui/devices/1080x1920/res/images/checkbox_empty.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/cursor.png b/gui/devices/1080x1920/res/images/cursor.png
deleted file mode 100644
index 39a7d6cd..00000000
Binary files a/gui/devices/1080x1920/res/images/cursor.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/curtain.jpg b/gui/devices/1080x1920/res/images/curtain.jpg
deleted file mode 100644
index 269941d5..00000000
Binary files a/gui/devices/1080x1920/res/images/curtain.jpg and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/file.png b/gui/devices/1080x1920/res/images/file.png
deleted file mode 100644
index 419ec10a..00000000
Binary files a/gui/devices/1080x1920/res/images/file.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/folder.png b/gui/devices/1080x1920/res/images/folder.png
deleted file mode 100644
index 8fa30774..00000000
Binary files a/gui/devices/1080x1920/res/images/folder.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/home-icon.png b/gui/devices/1080x1920/res/images/home-icon.png
deleted file mode 100644
index 23a02948..00000000
Binary files a/gui/devices/1080x1920/res/images/home-icon.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/indeterminate001.png b/gui/devices/1080x1920/res/images/indeterminate001.png
deleted file mode 100644
index 73918eee..00000000
Binary files a/gui/devices/1080x1920/res/images/indeterminate001.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/indeterminate002.png b/gui/devices/1080x1920/res/images/indeterminate002.png
deleted file mode 100644
index fbf23043..00000000
Binary files a/gui/devices/1080x1920/res/images/indeterminate002.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/indeterminate003.png b/gui/devices/1080x1920/res/images/indeterminate003.png
deleted file mode 100644
index 8edb400d..00000000
Binary files a/gui/devices/1080x1920/res/images/indeterminate003.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/indeterminate004.png b/gui/devices/1080x1920/res/images/indeterminate004.png
deleted file mode 100644
index 2810f8c1..00000000
Binary files a/gui/devices/1080x1920/res/images/indeterminate004.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/indeterminate005.png b/gui/devices/1080x1920/res/images/indeterminate005.png
deleted file mode 100644
index fe9bfa38..00000000
Binary files a/gui/devices/1080x1920/res/images/indeterminate005.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/indeterminate006.png b/gui/devices/1080x1920/res/images/indeterminate006.png
deleted file mode 100644
index e43aab7d..00000000
Binary files a/gui/devices/1080x1920/res/images/indeterminate006.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/keyboard1.png b/gui/devices/1080x1920/res/images/keyboard1.png
deleted file mode 100644
index 5c273378..00000000
Binary files a/gui/devices/1080x1920/res/images/keyboard1.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/keyboard2.png b/gui/devices/1080x1920/res/images/keyboard2.png
deleted file mode 100644
index fd3b628c..00000000
Binary files a/gui/devices/1080x1920/res/images/keyboard2.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/keyboard3.png b/gui/devices/1080x1920/res/images/keyboard3.png
deleted file mode 100644
index 400e8e72..00000000
Binary files a/gui/devices/1080x1920/res/images/keyboard3.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/keyboard4.png b/gui/devices/1080x1920/res/images/keyboard4.png
deleted file mode 100644
index 14c53fff..00000000
Binary files a/gui/devices/1080x1920/res/images/keyboard4.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/medium-button.png b/gui/devices/1080x1920/res/images/medium-button.png
deleted file mode 100644
index 9eabb3b2..00000000
Binary files a/gui/devices/1080x1920/res/images/medium-button.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/menu-button.png b/gui/devices/1080x1920/res/images/menu-button.png
deleted file mode 100644
index 01fd37ba..00000000
Binary files a/gui/devices/1080x1920/res/images/menu-button.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/minus-button.png b/gui/devices/1080x1920/res/images/minus-button.png
deleted file mode 100644
index 2e4be8fa..00000000
Binary files a/gui/devices/1080x1920/res/images/minus-button.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/plus-button.png b/gui/devices/1080x1920/res/images/plus-button.png
deleted file mode 100644
index 33ca71e6..00000000
Binary files a/gui/devices/1080x1920/res/images/plus-button.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/progress_empty.png b/gui/devices/1080x1920/res/images/progress_empty.png
deleted file mode 100644
index 87735f93..00000000
Binary files a/gui/devices/1080x1920/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/progress_fill.png b/gui/devices/1080x1920/res/images/progress_fill.png
deleted file mode 100644
index e359ea22..00000000
Binary files a/gui/devices/1080x1920/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/radio_empty.png b/gui/devices/1080x1920/res/images/radio_empty.png
deleted file mode 100644
index 1b76f146..00000000
Binary files a/gui/devices/1080x1920/res/images/radio_empty.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/radio_selected.png b/gui/devices/1080x1920/res/images/radio_selected.png
deleted file mode 100644
index f16f6295..00000000
Binary files a/gui/devices/1080x1920/res/images/radio_selected.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/slideout.png b/gui/devices/1080x1920/res/images/slideout.png
deleted file mode 100644
index 6fb41303..00000000
Binary files a/gui/devices/1080x1920/res/images/slideout.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/slider-touch.png b/gui/devices/1080x1920/res/images/slider-touch.png
deleted file mode 100644
index df02672f..00000000
Binary files a/gui/devices/1080x1920/res/images/slider-touch.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/slider-used.png b/gui/devices/1080x1920/res/images/slider-used.png
deleted file mode 100644
index a30331bf..00000000
Binary files a/gui/devices/1080x1920/res/images/slider-used.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/slider.png b/gui/devices/1080x1920/res/images/slider.png
deleted file mode 100644
index e73cbf28..00000000
Binary files a/gui/devices/1080x1920/res/images/slider.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/sort-button.png b/gui/devices/1080x1920/res/images/sort-button.png
deleted file mode 100644
index e28c58c9..00000000
Binary files a/gui/devices/1080x1920/res/images/sort-button.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/twrplogo.png b/gui/devices/1080x1920/res/images/twrplogo.png
deleted file mode 100644
index a3f433a9..00000000
Binary files a/gui/devices/1080x1920/res/images/twrplogo.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/unlock.png b/gui/devices/1080x1920/res/images/unlock.png
deleted file mode 100644
index e582e1cf..00000000
Binary files a/gui/devices/1080x1920/res/images/unlock.png and /dev/null differ
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
deleted file mode 100644
index 79bf5025..00000000
--- a/gui/devices/1080x1920/res/ui.xml
+++ /dev/null
@@ -1,506 +0,0 @@
-
-
-
-
-
- TeamWin
- Backup Naowz
- Default basic theme
- preview.jpg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/1920x1200/res/images/back-icon.png b/gui/devices/1920x1200/res/images/back-icon.png
deleted file mode 100644
index 52135970..00000000
Binary files a/gui/devices/1920x1200/res/images/back-icon.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/button.png b/gui/devices/1920x1200/res/images/button.png
deleted file mode 100644
index b785f996..00000000
Binary files a/gui/devices/1920x1200/res/images/button.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/checkbox_checked.png b/gui/devices/1920x1200/res/images/checkbox_checked.png
deleted file mode 100644
index 2b7ad591..00000000
Binary files a/gui/devices/1920x1200/res/images/checkbox_checked.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/checkbox_empty.png b/gui/devices/1920x1200/res/images/checkbox_empty.png
deleted file mode 100644
index 5c0b7bab..00000000
Binary files a/gui/devices/1920x1200/res/images/checkbox_empty.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/console-icon.png b/gui/devices/1920x1200/res/images/console-icon.png
deleted file mode 100644
index 1e800e6a..00000000
Binary files a/gui/devices/1920x1200/res/images/console-icon.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/console-toggle.png b/gui/devices/1920x1200/res/images/console-toggle.png
deleted file mode 100644
index 76d0e488..00000000
Binary files a/gui/devices/1920x1200/res/images/console-toggle.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/cursor.png b/gui/devices/1920x1200/res/images/cursor.png
deleted file mode 100644
index 39a7d6cd..00000000
Binary files a/gui/devices/1920x1200/res/images/cursor.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/curtain.jpg b/gui/devices/1920x1200/res/images/curtain.jpg
deleted file mode 100644
index 409664c6..00000000
Binary files a/gui/devices/1920x1200/res/images/curtain.jpg and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/file.png b/gui/devices/1920x1200/res/images/file.png
deleted file mode 100644
index 9d645770..00000000
Binary files a/gui/devices/1920x1200/res/images/file.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/folder.png b/gui/devices/1920x1200/res/images/folder.png
deleted file mode 100644
index 04017d27..00000000
Binary files a/gui/devices/1920x1200/res/images/folder.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/home-icon.png b/gui/devices/1920x1200/res/images/home-icon.png
deleted file mode 100644
index a326d300..00000000
Binary files a/gui/devices/1920x1200/res/images/home-icon.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/indeterminate001.png b/gui/devices/1920x1200/res/images/indeterminate001.png
deleted file mode 100644
index 93916fc2..00000000
Binary files a/gui/devices/1920x1200/res/images/indeterminate001.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/indeterminate002.png b/gui/devices/1920x1200/res/images/indeterminate002.png
deleted file mode 100644
index 087bafe9..00000000
Binary files a/gui/devices/1920x1200/res/images/indeterminate002.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/indeterminate003.png b/gui/devices/1920x1200/res/images/indeterminate003.png
deleted file mode 100644
index 881de5bd..00000000
Binary files a/gui/devices/1920x1200/res/images/indeterminate003.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/indeterminate004.png b/gui/devices/1920x1200/res/images/indeterminate004.png
deleted file mode 100644
index 757a0cd1..00000000
Binary files a/gui/devices/1920x1200/res/images/indeterminate004.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/indeterminate005.png b/gui/devices/1920x1200/res/images/indeterminate005.png
deleted file mode 100644
index 3092415c..00000000
Binary files a/gui/devices/1920x1200/res/images/indeterminate005.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/indeterminate006.png b/gui/devices/1920x1200/res/images/indeterminate006.png
deleted file mode 100644
index 25bbb3d1..00000000
Binary files a/gui/devices/1920x1200/res/images/indeterminate006.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/keyboard1.png b/gui/devices/1920x1200/res/images/keyboard1.png
deleted file mode 100644
index 7d42276e..00000000
Binary files a/gui/devices/1920x1200/res/images/keyboard1.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/keyboard2.png b/gui/devices/1920x1200/res/images/keyboard2.png
deleted file mode 100644
index ff0600d5..00000000
Binary files a/gui/devices/1920x1200/res/images/keyboard2.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/keyboard3.png b/gui/devices/1920x1200/res/images/keyboard3.png
deleted file mode 100644
index 8c90d0c6..00000000
Binary files a/gui/devices/1920x1200/res/images/keyboard3.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/keyboard4.png b/gui/devices/1920x1200/res/images/keyboard4.png
deleted file mode 100644
index d0f3e414..00000000
Binary files a/gui/devices/1920x1200/res/images/keyboard4.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/medium-button.png b/gui/devices/1920x1200/res/images/medium-button.png
deleted file mode 100644
index 51593fef..00000000
Binary files a/gui/devices/1920x1200/res/images/medium-button.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/mediumwide-button.png b/gui/devices/1920x1200/res/images/mediumwide-button.png
deleted file mode 100644
index b18b6533..00000000
Binary files a/gui/devices/1920x1200/res/images/mediumwide-button.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/minus-button.png b/gui/devices/1920x1200/res/images/minus-button.png
deleted file mode 100644
index 7e86486a..00000000
Binary files a/gui/devices/1920x1200/res/images/minus-button.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/plus-button.png b/gui/devices/1920x1200/res/images/plus-button.png
deleted file mode 100644
index ccd96d99..00000000
Binary files a/gui/devices/1920x1200/res/images/plus-button.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/progress_empty.png b/gui/devices/1920x1200/res/images/progress_empty.png
deleted file mode 100644
index dab79ea3..00000000
Binary files a/gui/devices/1920x1200/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/progress_fill.png b/gui/devices/1920x1200/res/images/progress_fill.png
deleted file mode 100644
index 19991306..00000000
Binary files a/gui/devices/1920x1200/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/radio_empty.png b/gui/devices/1920x1200/res/images/radio_empty.png
deleted file mode 100644
index 10d0b94a..00000000
Binary files a/gui/devices/1920x1200/res/images/radio_empty.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/radio_selected.png b/gui/devices/1920x1200/res/images/radio_selected.png
deleted file mode 100644
index eabd5c4c..00000000
Binary files a/gui/devices/1920x1200/res/images/radio_selected.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/slider-touch.png b/gui/devices/1920x1200/res/images/slider-touch.png
deleted file mode 100644
index 9f8b4f54..00000000
Binary files a/gui/devices/1920x1200/res/images/slider-touch.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/slider-used.png b/gui/devices/1920x1200/res/images/slider-used.png
deleted file mode 100644
index 5117203b..00000000
Binary files a/gui/devices/1920x1200/res/images/slider-used.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/slider.png b/gui/devices/1920x1200/res/images/slider.png
deleted file mode 100644
index ea2a272c..00000000
Binary files a/gui/devices/1920x1200/res/images/slider.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/sort-button.png b/gui/devices/1920x1200/res/images/sort-button.png
deleted file mode 100644
index e10a3863..00000000
Binary files a/gui/devices/1920x1200/res/images/sort-button.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/twrplogo.png b/gui/devices/1920x1200/res/images/twrplogo.png
deleted file mode 100644
index 77c77124..00000000
Binary files a/gui/devices/1920x1200/res/images/twrplogo.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/unlock.png b/gui/devices/1920x1200/res/images/unlock.png
deleted file mode 100644
index 11109bb0..00000000
Binary files a/gui/devices/1920x1200/res/images/unlock.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
deleted file mode 100644
index ae75f8de..00000000
--- a/gui/devices/1920x1200/res/ui.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-
-
-
-
-
- TeamWin
- Backup Naowz
- Default basic theme
- preview.jpg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/320x320/res/images/back-icon.png b/gui/devices/320x320/res/images/back-icon.png
deleted file mode 100644
index 85b05e66..00000000
Binary files a/gui/devices/320x320/res/images/back-icon.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/checkbox_checked.png b/gui/devices/320x320/res/images/checkbox_checked.png
deleted file mode 100644
index 6a130f2c..00000000
Binary files a/gui/devices/320x320/res/images/checkbox_checked.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/checkbox_empty.png b/gui/devices/320x320/res/images/checkbox_empty.png
deleted file mode 100644
index 67fe20b3..00000000
Binary files a/gui/devices/320x320/res/images/checkbox_empty.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/cursor.png b/gui/devices/320x320/res/images/cursor.png
deleted file mode 100644
index 39a7d6cd..00000000
Binary files a/gui/devices/320x320/res/images/cursor.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/curtain.jpg b/gui/devices/320x320/res/images/curtain.jpg
deleted file mode 100644
index 0368a657..00000000
Binary files a/gui/devices/320x320/res/images/curtain.jpg and /dev/null differ
diff --git a/gui/devices/320x320/res/images/file.png b/gui/devices/320x320/res/images/file.png
deleted file mode 100644
index 4e77eab6..00000000
Binary files a/gui/devices/320x320/res/images/file.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/folder.png b/gui/devices/320x320/res/images/folder.png
deleted file mode 100644
index 7797226d..00000000
Binary files a/gui/devices/320x320/res/images/folder.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/home-icon.png b/gui/devices/320x320/res/images/home-icon.png
deleted file mode 100644
index c14b53b5..00000000
Binary files a/gui/devices/320x320/res/images/home-icon.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/indeterminate001.png b/gui/devices/320x320/res/images/indeterminate001.png
deleted file mode 100644
index 63117b4a..00000000
Binary files a/gui/devices/320x320/res/images/indeterminate001.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/indeterminate002.png b/gui/devices/320x320/res/images/indeterminate002.png
deleted file mode 100644
index 428caa01..00000000
Binary files a/gui/devices/320x320/res/images/indeterminate002.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/indeterminate003.png b/gui/devices/320x320/res/images/indeterminate003.png
deleted file mode 100644
index 0ce35043..00000000
Binary files a/gui/devices/320x320/res/images/indeterminate003.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/indeterminate004.png b/gui/devices/320x320/res/images/indeterminate004.png
deleted file mode 100644
index 83728046..00000000
Binary files a/gui/devices/320x320/res/images/indeterminate004.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/indeterminate005.png b/gui/devices/320x320/res/images/indeterminate005.png
deleted file mode 100644
index 9985f085..00000000
Binary files a/gui/devices/320x320/res/images/indeterminate005.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/indeterminate006.png b/gui/devices/320x320/res/images/indeterminate006.png
deleted file mode 100644
index 5f7ee992..00000000
Binary files a/gui/devices/320x320/res/images/indeterminate006.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/keyboard1.png b/gui/devices/320x320/res/images/keyboard1.png
deleted file mode 100644
index 43d588a2..00000000
Binary files a/gui/devices/320x320/res/images/keyboard1.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/keyboard2.png b/gui/devices/320x320/res/images/keyboard2.png
deleted file mode 100644
index 31807abb..00000000
Binary files a/gui/devices/320x320/res/images/keyboard2.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/keyboard3.png b/gui/devices/320x320/res/images/keyboard3.png
deleted file mode 100644
index cbb1cfbb..00000000
Binary files a/gui/devices/320x320/res/images/keyboard3.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/keyboard4.png b/gui/devices/320x320/res/images/keyboard4.png
deleted file mode 100644
index a6173baf..00000000
Binary files a/gui/devices/320x320/res/images/keyboard4.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/medium-button.png b/gui/devices/320x320/res/images/medium-button.png
deleted file mode 100644
index dec6945a..00000000
Binary files a/gui/devices/320x320/res/images/medium-button.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/menu-button.png b/gui/devices/320x320/res/images/menu-button.png
deleted file mode 100644
index 80670123..00000000
Binary files a/gui/devices/320x320/res/images/menu-button.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/minus-button.png b/gui/devices/320x320/res/images/minus-button.png
deleted file mode 100644
index 8e749697..00000000
Binary files a/gui/devices/320x320/res/images/minus-button.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/plus-button.png b/gui/devices/320x320/res/images/plus-button.png
deleted file mode 100644
index de8e3339..00000000
Binary files a/gui/devices/320x320/res/images/plus-button.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/progress_empty.png b/gui/devices/320x320/res/images/progress_empty.png
deleted file mode 100644
index cc65c388..00000000
Binary files a/gui/devices/320x320/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/progress_fill.png b/gui/devices/320x320/res/images/progress_fill.png
deleted file mode 100644
index bdce31f8..00000000
Binary files a/gui/devices/320x320/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/radio_empty.png b/gui/devices/320x320/res/images/radio_empty.png
deleted file mode 100644
index 00451f79..00000000
Binary files a/gui/devices/320x320/res/images/radio_empty.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/radio_selected.png b/gui/devices/320x320/res/images/radio_selected.png
deleted file mode 100644
index 6db0504e..00000000
Binary files a/gui/devices/320x320/res/images/radio_selected.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/slideout.png b/gui/devices/320x320/res/images/slideout.png
deleted file mode 100644
index a5a5fcbd..00000000
Binary files a/gui/devices/320x320/res/images/slideout.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/slider-touch.png b/gui/devices/320x320/res/images/slider-touch.png
deleted file mode 100644
index d06e99f6..00000000
Binary files a/gui/devices/320x320/res/images/slider-touch.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/slider-used.png b/gui/devices/320x320/res/images/slider-used.png
deleted file mode 100644
index 1d819622..00000000
Binary files a/gui/devices/320x320/res/images/slider-used.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/slider.png b/gui/devices/320x320/res/images/slider.png
deleted file mode 100644
index f0520595..00000000
Binary files a/gui/devices/320x320/res/images/slider.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/sort-button.png b/gui/devices/320x320/res/images/sort-button.png
deleted file mode 100644
index 7b4a535a..00000000
Binary files a/gui/devices/320x320/res/images/sort-button.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/twrplogo.png b/gui/devices/320x320/res/images/twrplogo.png
deleted file mode 100644
index d6a400ad..00000000
Binary files a/gui/devices/320x320/res/images/twrplogo.png and /dev/null differ
diff --git a/gui/devices/320x320/res/images/unlock.png b/gui/devices/320x320/res/images/unlock.png
deleted file mode 100644
index 4007e0d7..00000000
Binary files a/gui/devices/320x320/res/images/unlock.png and /dev/null differ
diff --git a/gui/devices/320x320/res/ui.xml b/gui/devices/320x320/res/ui.xml
deleted file mode 100644
index 345a81c6..00000000
--- a/gui/devices/320x320/res/ui.xml
+++ /dev/null
@@ -1,469 +0,0 @@
-
-
-
-
-
-
- TeamWin
- Backup Naowz
- Default basic theme
- preview.jpg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/480x800/res/images/back-icon.png b/gui/devices/480x800/res/images/back-icon.png
deleted file mode 100644
index 987d859c..00000000
Binary files a/gui/devices/480x800/res/images/back-icon.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/checkbox_checked.png b/gui/devices/480x800/res/images/checkbox_checked.png
deleted file mode 100644
index a9ccc1af..00000000
Binary files a/gui/devices/480x800/res/images/checkbox_checked.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/checkbox_empty.png b/gui/devices/480x800/res/images/checkbox_empty.png
deleted file mode 100644
index 209100fc..00000000
Binary files a/gui/devices/480x800/res/images/checkbox_empty.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/cursor.png b/gui/devices/480x800/res/images/cursor.png
deleted file mode 100644
index 39a7d6cd..00000000
Binary files a/gui/devices/480x800/res/images/cursor.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/curtain.jpg b/gui/devices/480x800/res/images/curtain.jpg
deleted file mode 100644
index dfd59d96..00000000
Binary files a/gui/devices/480x800/res/images/curtain.jpg and /dev/null differ
diff --git a/gui/devices/480x800/res/images/file.png b/gui/devices/480x800/res/images/file.png
deleted file mode 100644
index 5b06f74a..00000000
Binary files a/gui/devices/480x800/res/images/file.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/folder.png b/gui/devices/480x800/res/images/folder.png
deleted file mode 100644
index a6def97d..00000000
Binary files a/gui/devices/480x800/res/images/folder.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/home-icon.png b/gui/devices/480x800/res/images/home-icon.png
deleted file mode 100644
index a7594a7a..00000000
Binary files a/gui/devices/480x800/res/images/home-icon.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/indeterminate001.png b/gui/devices/480x800/res/images/indeterminate001.png
deleted file mode 100644
index d3fe9517..00000000
Binary files a/gui/devices/480x800/res/images/indeterminate001.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/indeterminate002.png b/gui/devices/480x800/res/images/indeterminate002.png
deleted file mode 100644
index 08ed1ed3..00000000
Binary files a/gui/devices/480x800/res/images/indeterminate002.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/indeterminate003.png b/gui/devices/480x800/res/images/indeterminate003.png
deleted file mode 100644
index cbe0bd6b..00000000
Binary files a/gui/devices/480x800/res/images/indeterminate003.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/indeterminate004.png b/gui/devices/480x800/res/images/indeterminate004.png
deleted file mode 100644
index 0ec23576..00000000
Binary files a/gui/devices/480x800/res/images/indeterminate004.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/indeterminate005.png b/gui/devices/480x800/res/images/indeterminate005.png
deleted file mode 100644
index 36ac4013..00000000
Binary files a/gui/devices/480x800/res/images/indeterminate005.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/indeterminate006.png b/gui/devices/480x800/res/images/indeterminate006.png
deleted file mode 100644
index a46811d8..00000000
Binary files a/gui/devices/480x800/res/images/indeterminate006.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/keyboard1.png b/gui/devices/480x800/res/images/keyboard1.png
deleted file mode 100644
index d40b65ad..00000000
Binary files a/gui/devices/480x800/res/images/keyboard1.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/keyboard2.png b/gui/devices/480x800/res/images/keyboard2.png
deleted file mode 100644
index 398e31fd..00000000
Binary files a/gui/devices/480x800/res/images/keyboard2.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/keyboard3.png b/gui/devices/480x800/res/images/keyboard3.png
deleted file mode 100644
index 36676579..00000000
Binary files a/gui/devices/480x800/res/images/keyboard3.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/keyboard4.png b/gui/devices/480x800/res/images/keyboard4.png
deleted file mode 100644
index 18244e26..00000000
Binary files a/gui/devices/480x800/res/images/keyboard4.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/medium-button.png b/gui/devices/480x800/res/images/medium-button.png
deleted file mode 100644
index 7befcc9b..00000000
Binary files a/gui/devices/480x800/res/images/medium-button.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/menu-button.png b/gui/devices/480x800/res/images/menu-button.png
deleted file mode 100644
index 4f70b89d..00000000
Binary files a/gui/devices/480x800/res/images/menu-button.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/minus-button.png b/gui/devices/480x800/res/images/minus-button.png
deleted file mode 100644
index 265cb854..00000000
Binary files a/gui/devices/480x800/res/images/minus-button.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/plus-button.png b/gui/devices/480x800/res/images/plus-button.png
deleted file mode 100644
index 6d1434fd..00000000
Binary files a/gui/devices/480x800/res/images/plus-button.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/progress_empty.png b/gui/devices/480x800/res/images/progress_empty.png
deleted file mode 100644
index 1a7471e4..00000000
Binary files a/gui/devices/480x800/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/progress_fill.png b/gui/devices/480x800/res/images/progress_fill.png
deleted file mode 100644
index a67e8ff2..00000000
Binary files a/gui/devices/480x800/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/radio_empty.png b/gui/devices/480x800/res/images/radio_empty.png
deleted file mode 100644
index e161e398..00000000
Binary files a/gui/devices/480x800/res/images/radio_empty.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/radio_selected.png b/gui/devices/480x800/res/images/radio_selected.png
deleted file mode 100644
index 57c0242e..00000000
Binary files a/gui/devices/480x800/res/images/radio_selected.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/slideout.png b/gui/devices/480x800/res/images/slideout.png
deleted file mode 100644
index 6f6cde50..00000000
Binary files a/gui/devices/480x800/res/images/slideout.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/slider-touch.png b/gui/devices/480x800/res/images/slider-touch.png
deleted file mode 100644
index b4d25dad..00000000
Binary files a/gui/devices/480x800/res/images/slider-touch.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/slider-used.png b/gui/devices/480x800/res/images/slider-used.png
deleted file mode 100644
index 085307f3..00000000
Binary files a/gui/devices/480x800/res/images/slider-used.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/slider.png b/gui/devices/480x800/res/images/slider.png
deleted file mode 100644
index 246eb037..00000000
Binary files a/gui/devices/480x800/res/images/slider.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/sort-button.png b/gui/devices/480x800/res/images/sort-button.png
deleted file mode 100644
index e079700f..00000000
Binary files a/gui/devices/480x800/res/images/sort-button.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/twrplogo.png b/gui/devices/480x800/res/images/twrplogo.png
deleted file mode 100644
index 08acdddf..00000000
Binary files a/gui/devices/480x800/res/images/twrplogo.png and /dev/null differ
diff --git a/gui/devices/480x800/res/images/unlock.png b/gui/devices/480x800/res/images/unlock.png
deleted file mode 100644
index 88e27bff..00000000
Binary files a/gui/devices/480x800/res/images/unlock.png and /dev/null differ
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
deleted file mode 100644
index ec9df7ed..00000000
--- a/gui/devices/480x800/res/ui.xml
+++ /dev/null
@@ -1,469 +0,0 @@
-
-
-
-
-
- TeamWin
- Backup Naowz
- Default basic theme
- preview.jpg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/800x480/res/images/back-icon.png b/gui/devices/800x480/res/images/back-icon.png
deleted file mode 100644
index 5b093deb..00000000
Binary files a/gui/devices/800x480/res/images/back-icon.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/button.png b/gui/devices/800x480/res/images/button.png
deleted file mode 100644
index 97b82b24..00000000
Binary files a/gui/devices/800x480/res/images/button.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/checkbox_checked.png b/gui/devices/800x480/res/images/checkbox_checked.png
deleted file mode 100644
index b8d709f3..00000000
Binary files a/gui/devices/800x480/res/images/checkbox_checked.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/checkbox_empty.png b/gui/devices/800x480/res/images/checkbox_empty.png
deleted file mode 100644
index 9d84cfa5..00000000
Binary files a/gui/devices/800x480/res/images/checkbox_empty.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/console-icon.png b/gui/devices/800x480/res/images/console-icon.png
deleted file mode 100644
index da9536e8..00000000
Binary files a/gui/devices/800x480/res/images/console-icon.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/console-toggle.png b/gui/devices/800x480/res/images/console-toggle.png
deleted file mode 100644
index 6f6cde50..00000000
Binary files a/gui/devices/800x480/res/images/console-toggle.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/cursor.png b/gui/devices/800x480/res/images/cursor.png
deleted file mode 100644
index 39a7d6cd..00000000
Binary files a/gui/devices/800x480/res/images/cursor.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/curtain.jpg b/gui/devices/800x480/res/images/curtain.jpg
deleted file mode 100644
index 1f03eb5e..00000000
Binary files a/gui/devices/800x480/res/images/curtain.jpg and /dev/null differ
diff --git a/gui/devices/800x480/res/images/file.png b/gui/devices/800x480/res/images/file.png
deleted file mode 100644
index 5b06f74a..00000000
Binary files a/gui/devices/800x480/res/images/file.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/folder.png b/gui/devices/800x480/res/images/folder.png
deleted file mode 100644
index a6def97d..00000000
Binary files a/gui/devices/800x480/res/images/folder.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/home-icon.png b/gui/devices/800x480/res/images/home-icon.png
deleted file mode 100644
index 30bdc8aa..00000000
Binary files a/gui/devices/800x480/res/images/home-icon.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/indeterminate001.png b/gui/devices/800x480/res/images/indeterminate001.png
deleted file mode 100644
index d3fe9517..00000000
Binary files a/gui/devices/800x480/res/images/indeterminate001.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/indeterminate002.png b/gui/devices/800x480/res/images/indeterminate002.png
deleted file mode 100644
index 08ed1ed3..00000000
Binary files a/gui/devices/800x480/res/images/indeterminate002.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/indeterminate003.png b/gui/devices/800x480/res/images/indeterminate003.png
deleted file mode 100644
index cbe0bd6b..00000000
Binary files a/gui/devices/800x480/res/images/indeterminate003.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/indeterminate004.png b/gui/devices/800x480/res/images/indeterminate004.png
deleted file mode 100644
index 0ec23576..00000000
Binary files a/gui/devices/800x480/res/images/indeterminate004.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/indeterminate005.png b/gui/devices/800x480/res/images/indeterminate005.png
deleted file mode 100644
index 36ac4013..00000000
Binary files a/gui/devices/800x480/res/images/indeterminate005.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/indeterminate006.png b/gui/devices/800x480/res/images/indeterminate006.png
deleted file mode 100644
index a46811d8..00000000
Binary files a/gui/devices/800x480/res/images/indeterminate006.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/keyboard1.png b/gui/devices/800x480/res/images/keyboard1.png
deleted file mode 100644
index 906e539f..00000000
Binary files a/gui/devices/800x480/res/images/keyboard1.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/keyboard2.png b/gui/devices/800x480/res/images/keyboard2.png
deleted file mode 100644
index 8b25311d..00000000
Binary files a/gui/devices/800x480/res/images/keyboard2.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/keyboard3.png b/gui/devices/800x480/res/images/keyboard3.png
deleted file mode 100644
index bb8a3470..00000000
Binary files a/gui/devices/800x480/res/images/keyboard3.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/keyboard4.png b/gui/devices/800x480/res/images/keyboard4.png
deleted file mode 100644
index 0c1cb663..00000000
Binary files a/gui/devices/800x480/res/images/keyboard4.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/medium-button.png b/gui/devices/800x480/res/images/medium-button.png
deleted file mode 100644
index 6dbafb38..00000000
Binary files a/gui/devices/800x480/res/images/medium-button.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/mediumwide-button.png b/gui/devices/800x480/res/images/mediumwide-button.png
deleted file mode 100644
index 69355e0b..00000000
Binary files a/gui/devices/800x480/res/images/mediumwide-button.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/minus-button.png b/gui/devices/800x480/res/images/minus-button.png
deleted file mode 100644
index 63c58699..00000000
Binary files a/gui/devices/800x480/res/images/minus-button.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/plus-button.png b/gui/devices/800x480/res/images/plus-button.png
deleted file mode 100644
index da3e3f55..00000000
Binary files a/gui/devices/800x480/res/images/plus-button.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/progress_empty.png b/gui/devices/800x480/res/images/progress_empty.png
deleted file mode 100644
index 1a7471e4..00000000
Binary files a/gui/devices/800x480/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/progress_fill.png b/gui/devices/800x480/res/images/progress_fill.png
deleted file mode 100644
index a67e8ff2..00000000
Binary files a/gui/devices/800x480/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/radio_empty.png b/gui/devices/800x480/res/images/radio_empty.png
deleted file mode 100644
index f3e2810b..00000000
Binary files a/gui/devices/800x480/res/images/radio_empty.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/radio_selected.png b/gui/devices/800x480/res/images/radio_selected.png
deleted file mode 100644
index c4900795..00000000
Binary files a/gui/devices/800x480/res/images/radio_selected.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/slider-touch.png b/gui/devices/800x480/res/images/slider-touch.png
deleted file mode 100644
index 4944fa77..00000000
Binary files a/gui/devices/800x480/res/images/slider-touch.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/slider-used.png b/gui/devices/800x480/res/images/slider-used.png
deleted file mode 100644
index 5b2c4627..00000000
Binary files a/gui/devices/800x480/res/images/slider-used.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/slider.png b/gui/devices/800x480/res/images/slider.png
deleted file mode 100644
index 445d923f..00000000
Binary files a/gui/devices/800x480/res/images/slider.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/sort-button.png b/gui/devices/800x480/res/images/sort-button.png
deleted file mode 100644
index 310cb4a3..00000000
Binary files a/gui/devices/800x480/res/images/sort-button.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/twrplogo.png b/gui/devices/800x480/res/images/twrplogo.png
deleted file mode 100644
index a362980d..00000000
Binary files a/gui/devices/800x480/res/images/twrplogo.png and /dev/null differ
diff --git a/gui/devices/800x480/res/images/unlock.png b/gui/devices/800x480/res/images/unlock.png
deleted file mode 100644
index c53181e6..00000000
Binary files a/gui/devices/800x480/res/images/unlock.png and /dev/null differ
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
deleted file mode 100644
index a561a3cc..00000000
--- a/gui/devices/800x480/res/ui.xml
+++ /dev/null
@@ -1,500 +0,0 @@
-
-
-
-
-
- TeamWin
- Backup Naowz
- Default basic theme
- preview.jpg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/common/res/fonts/DroidSansMono.ttf b/gui/devices/common/res/fonts/DroidSansMono.ttf
deleted file mode 100644
index 4085cee8..00000000
Binary files a/gui/devices/common/res/fonts/DroidSansMono.ttf and /dev/null differ
diff --git a/gui/devices/common/res/fonts/RobotoCondensed-Regular.ttf b/gui/devices/common/res/fonts/RobotoCondensed-Regular.ttf
deleted file mode 100644
index b9fc49c9..00000000
Binary files a/gui/devices/common/res/fonts/RobotoCondensed-Regular.ttf and /dev/null differ
diff --git a/gui/devices/common/res/images/progress_empty.png b/gui/devices/common/res/images/progress_empty.png
deleted file mode 100644
index 1a7471e4..00000000
Binary files a/gui/devices/common/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/common/res/images/progress_fill.png b/gui/devices/common/res/images/progress_fill.png
deleted file mode 100644
index 7f4121fe..00000000
Binary files a/gui/devices/common/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/common/res/languages/en.xml b/gui/devices/common/res/languages/en.xml
deleted file mode 100644
index e47ee705..00000000
--- a/gui/devices/common/res/languages/en.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-
-
-
- English
-
-
-
-
-
-
-
-
-
- System
- System Image
- Vendor
- Vendor Image
- Boot
- Recovery
- Cache
- Data
- SDCard
- Internal Storage
- Micro SDCard
- USB OTG
- Android Secure
- Dalvik / ART Cache
-
- SD-EXT
-
-
- Install
-
-
- Kernel does not have support for reading SELinux contexts.
- Full SELinux support is present.
- No SELinux support (no libselinux).
- MTP Enabled
- MTP Crashed, not starting MTP on boot.
- Rebooting...
- Successfully decrypted with default password.
- Unable to decrypt with default password. You may need to perform a Format Data.
- Generating MD5
-
- * Generating md5...
- * MD5 Created.
- * MD5 Error!
- * Error computing MD5.
- (Current Date)
- (Auto Generate)
- Unable to locate '{1}' partition for backup calculations.
- No partitions selected for backup.
- * Total number of partitions to back up: {1}
- * Total size of all data: {1}MB
- * Available space: {1}MB
- Unable to locate storage device.
- Not enough free space on storage.
- [BACKUP STARTED]
- * Backup Folder: {1}
- Failed to make backup folder.
- Average backup rate for file systems: {1} MB/sec
- Average backup rate for imaged drives: {1} MB/sec
- [{1} MB TOTAL BACKED UP]
- [BACKUP COMPLETED IN {1} SECONDS]
- [RESTORE STARTED]
- Restore folder: '{1}'
-
- [{1} done ({2} seconds)]
- Verifying MD5
- Skipping MD5 check based on user setting.
- Calculating restore details...
- Cannot restore {1} -- mounted read only.
- Unable to locate '{1}' partition for restoring.
- No partitions selected for restore.
- Restoring {1} partitions...
- Total restore size is {1}MB
- Updating System Details
- Restore Complete
- [RESTORE COMPLETED IN {1} SECONDS]
-
- Error opening: '{1}' ({2})
- Unable to locate partition by backup name: '{1}'
- Unable to find partition for path '{1}'
- Updating partition details...
- ...done
- Wiping Dalvik Cache Directories...
- Cleaned: {1}...
- -- Dalvik Cache Directories Wipe Complete!
- No android secure partitions found.
- Unable to locate {1}.
- Wiping internal storage -- /data/media...
- Unable to mount {1}
- Unable to mount internal_storage
- Unable to mount storage
- Failed to decrypt data.
- No crypto support was compiled into this build.
- Data successfully decrypted, new block device: '{1}'
- Done.
- Partitioning SD Card...
- Unable to locate device to partition.
- EXT + Swap size is larger than sdcard size.
- Removing partition table...
- Unable to remove partition table.
- Creating {1} partition...
- Unable to create {1} partition.
- Formatting sd-ext as {1}...
- Partitioning complete.
- Unable to open '{1}'.
- MTP already enabled
- Failed to enable MTP
- MTP support not included
- [IMAGE FLASH STARTED]
- Image to flash: '{1}'
- Unable to locate '{1}' partition for flashing.
- No partitions selected for flashing.
- Too many partitions selected for flashing.
- Invalid flash partition specified.
- [IMAGE FLASH COMPLETED]
- Wiping {1}
- {1} does not exist! Cannot repair!
- Repairing {1} using {2}...
- Unable to repair {1}.
- Could not mount /data and unable to find crypto footer.
-
- Can not create '{1}' folder ({2}).
-
- Failed to mount '{1}' ({2})
-
- Failed to unmount '{1}' ({2})
- Cannot resize {1}.
- Repairing {1} before resizing.
- Unable to resize {1}.
- No md5 file found for '{1}'. Please unselect Enable MD5 verification to restore.
- MD5 failed to match on '{1}'.
- Failed to decrypt tar file '{1}'
- You may need to reboot recovery to be able to use /data again.
- Unable to format to remove encryption.
- Formatting {1} using {2}...
- Unable to wipe {1}.
- Partition {1} cannot be wiped.
- Removing all files under '{1}'
- Wiping data without wiping /data/media ...
- Backing up {1}...
- Backing Up
- Backup file size for '{1}' is 0 bytes.
- WARNING: This /data backup was made with {1} file system! The backup may not boot unless you change back to {1}.
- Restoring {1}...
- Restoring
- Unable to recreate {1} folder.
- Size of image is larger than target device
- Flashing {1}...
- Backup folder set to '{1}'
- Unable to locate backup '{1}'
- Setting restore options: '{1}':
- MD5 check skip is on
- Unable to use OpenRecoveryScript to restore an encrypted backup.
- Mounting
- Unmounting
- Mounted '{1}'
- Unmounted '{1}'
- Setting '{1}' to '{2}'
- Setting '{1}' to empty
- Making Directory
- Making directory: '{1}'
- Running Command
- ADB Sideload
- Starting ADB sideload feature...
- You need adb 1.0.32 or newer to sideload to this device.
- No password provided.
- Done processing script file
- Injecting TWRP into boot image...
- Error installing zip file '{1}'
- Installing zip file '{1}'
- Setting backup options:
- Compression is on
- MD5 Generation is off
- Backup Failed
- Backup Failed. Cleaning Backup Folder.
- Running Recovery Commands
- Recovery Commands Complete
- Running OpenRecoveryScript
- OpenRecoveryScript Complete
- Could not find '{1}' in the zip file.
- Checking for MD5 file...
- Failed to map file '{1}'
- Verifying zip signature...
- Zip signature verification failed!
- Zip signature verified successfully.
- Zip file is corrupt!
- Skipping MD5 check: no MD5 file found
- MD5 does not match
- MD5 matched
- {1} process ended with signal: {2}
- {1} process ended with ERROR: {2}
- Installing HTC Dumlock to system...
- Restoring original boot...
- Reflashing recovery to boot...
- Running {1} script...
- Renamed stock recovery file in /system to prevent the stock ROM from replacing TWRP.
- Breaking backup file into multiple archives...
- Error creating backup.
- Error during restore process.
- Splitting thread ID {1} into archive {2}
-
- %llu of %llu files, %i%%
- %lluMB of %lluMB, %i%%
- Attempting to decrypt data partition via command line.
- Failed to load base packages.
- Simulating actions...
- Backup Cancelled
- Configuring TWRP...
- Unable to configure TWRP with this kernel.
- Copied recovery log to {1}.
- Maximum zip queue reached!
- Minimum zip queue reached!
- Failed to take a screenshot!
- One or more zip requested a cache wipe -- Wiping cache now.
- Unable to wipe android secure
- Failed to wipe dalvik
- (Auto Generate)
- (Current Date)
- Backup name is too long.
- Backup name '{1}' contains invalid character: '{1}'
- A backup with that name already exists!
- This device does not have a real SD Card! Aborting!
- Cancelling ADB sideload...
- Error changing file system.
- Custom theme version does not match TWRP version. Using stock theme.
- Rebooting in 5 seconds
- Error with ADB Backup. Quitting..."
- Cannot write to adb control channel
- --twrp option is required to enable twrp adb backup
- path: {1} not found in partititon list
-
-
diff --git a/gui/devices/common/res/languages/es.xml b/gui/devices/common/res/languages/es.xml
deleted file mode 100644
index ad5c54a7..00000000
--- a/gui/devices/common/res/languages/es.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- Español
-
-
-
-
-
-
- Instalar
-
-
diff --git a/gui/devices/common/res/languages/fi.xml b/gui/devices/common/res/languages/fi.xml
deleted file mode 100644
index 0c4f5bc8..00000000
--- a/gui/devices/common/res/languages/fi.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- Suomi
-
-
-
-
-
-
- Asenna
-
-
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
deleted file mode 100644
index c2a117df..00000000
--- a/gui/devices/landscape/res/landscape.xml
+++ /dev/null
@@ -1,3721 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
deleted file mode 100644
index 8d21777d..00000000
--- a/gui/devices/portrait/res/portrait.xml
+++ /dev/null
@@ -1,3769 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
deleted file mode 100644
index 2dc29122..00000000
--- a/gui/devices/watch/res/watch.xml
+++ /dev/null
@@ -1,3733 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-