diff --git a/bin/assets/ee.ini b/bin/assets/ee.ini
index e9fef62fb..cc577477b 100755
--- a/bin/assets/ee.ini
+++ b/bin/assets/ee.ini
@@ -14,3 +14,4 @@ ParticlesNum = 1000
 UseShaders = 1
 Music = 0
 PixelDensity = 1
+DebugUI = 0
diff --git a/bin/assets/ui/uitheme.eta b/bin/assets/ui/uitheme.eta
index 92ac1cfb4..dae2cb7e4 100644
Binary files a/bin/assets/ui/uitheme.eta and b/bin/assets/ui/uitheme.eta differ
diff --git a/bin/assets/ui/uitheme.png b/bin/assets/ui/uitheme.png
index ba6517ea3..b3a3fb5e2 100644
Binary files a/bin/assets/ui/uitheme.png and b/bin/assets/ui/uitheme.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown.4_3_4_3.9.png b/bin/assets/ui/uitheme/uitheme_button_mdown.4_3_4_3.9.png
new file mode 100644
index 000000000..710bf2231
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_button_mdown.4_3_4_3.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_d.png b/bin/assets/ui/uitheme/uitheme_button_mdown_d.png
deleted file mode 100644
index dd558c12a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_dl.png b/bin/assets/ui/uitheme/uitheme_button_mdown_dl.png
deleted file mode 100644
index 11557ff63..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_dr.png b/bin/assets/ui/uitheme/uitheme_button_mdown_dr.png
deleted file mode 100644
index 5275a7cd6..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_m.png b/bin/assets/ui/uitheme/uitheme_button_mdown_m.png
deleted file mode 100644
index 1be3e1d4d..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_ml.png b/bin/assets/ui/uitheme/uitheme_button_mdown_ml.png
deleted file mode 100644
index 0cea70009..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_mr.png b/bin/assets/ui/uitheme/uitheme_button_mdown_mr.png
deleted file mode 100644
index 929fce20f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_u.png b/bin/assets/ui/uitheme/uitheme_button_mdown_u.png
deleted file mode 100644
index 434471e47..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_ul.png b/bin/assets/ui/uitheme/uitheme_button_mdown_ul.png
deleted file mode 100644
index 4e5e63f91..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown_ur.png b/bin/assets/ui/uitheme/uitheme_button_mdown_ur.png
deleted file mode 100644
index f8c12eef5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_mdown_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter.4_3_4_3.9.png b/bin/assets/ui/uitheme/uitheme_button_menter.4_3_4_3.9.png
new file mode 100644
index 000000000..f5ec07e30
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_button_menter.4_3_4_3.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_d.png b/bin/assets/ui/uitheme/uitheme_button_menter_d.png
deleted file mode 100644
index 64cafaff7..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_dl.png b/bin/assets/ui/uitheme/uitheme_button_menter_dl.png
deleted file mode 100644
index 70e5e9ac7..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_dr.png b/bin/assets/ui/uitheme/uitheme_button_menter_dr.png
deleted file mode 100644
index d82b63696..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_m.png b/bin/assets/ui/uitheme/uitheme_button_menter_m.png
deleted file mode 100644
index 5aac15f24..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_ml.png b/bin/assets/ui/uitheme/uitheme_button_menter_ml.png
deleted file mode 100644
index 3bd117751..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_mr.png b/bin/assets/ui/uitheme/uitheme_button_menter_mr.png
deleted file mode 100644
index 39c4e30ef..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_u.png b/bin/assets/ui/uitheme/uitheme_button_menter_u.png
deleted file mode 100644
index c1ccfd23c..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_ul.png b/bin/assets/ui/uitheme/uitheme_button_menter_ul.png
deleted file mode 100644
index f6cedbe6c..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_menter_ur.png b/bin/assets/ui/uitheme/uitheme_button_menter_ur.png
deleted file mode 100644
index 39e1eff1a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_menter_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal.4_3_4_3.9.png b/bin/assets/ui/uitheme/uitheme_button_normal.4_3_4_3.9.png
new file mode 100644
index 000000000..df8e79117
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_button_normal.4_3_4_3.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_d.png b/bin/assets/ui/uitheme/uitheme_button_normal_d.png
deleted file mode 100644
index b5601940d..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_dl.png b/bin/assets/ui/uitheme/uitheme_button_normal_dl.png
deleted file mode 100644
index 70e5e9ac7..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_dr.png b/bin/assets/ui/uitheme/uitheme_button_normal_dr.png
deleted file mode 100644
index d82b63696..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_m.png b/bin/assets/ui/uitheme/uitheme_button_normal_m.png
deleted file mode 100644
index 9d790af57..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_ml.png b/bin/assets/ui/uitheme/uitheme_button_normal_ml.png
deleted file mode 100644
index 3af4109db..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_mr.png b/bin/assets/ui/uitheme/uitheme_button_normal_mr.png
deleted file mode 100644
index 80173495e..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_u.png b/bin/assets/ui/uitheme/uitheme_button_normal_u.png
deleted file mode 100644
index 819f34c97..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_ul.png b/bin/assets/ui/uitheme/uitheme_button_normal_ul.png
deleted file mode 100644
index 9123a697a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_normal_ur.png b/bin/assets/ui/uitheme/uitheme_button_normal_ur.png
deleted file mode 100644
index 0e0f1bf0f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected.4_3_4_3.9.png b/bin/assets/ui/uitheme/uitheme_button_selected.4_3_4_3.9.png
new file mode 100644
index 000000000..16352da38
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_button_selected.4_3_4_3.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_d.png b/bin/assets/ui/uitheme/uitheme_button_selected_d.png
deleted file mode 100644
index 1636a508a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_dl.png b/bin/assets/ui/uitheme/uitheme_button_selected_dl.png
deleted file mode 100644
index 84498c4e9..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_dr.png b/bin/assets/ui/uitheme/uitheme_button_selected_dr.png
deleted file mode 100644
index 4e4d9a658..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_m.png b/bin/assets/ui/uitheme/uitheme_button_selected_m.png
deleted file mode 100644
index 68e5d05b1..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_ml.png b/bin/assets/ui/uitheme/uitheme_button_selected_ml.png
deleted file mode 100644
index 8ace8d953..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_mr.png b/bin/assets/ui/uitheme/uitheme_button_selected_mr.png
deleted file mode 100644
index 559da62b5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_u.png b/bin/assets/ui/uitheme/uitheme_button_selected_u.png
deleted file mode 100644
index f95be42df..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_ul.png b/bin/assets/ui/uitheme/uitheme_button_selected_ul.png
deleted file mode 100644
index fabf8fe04..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_button_selected_ur.png b/bin/assets/ui/uitheme/uitheme_button_selected_ur.png
deleted file mode 100644
index 891e63f10..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_button_selected_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_button_menter.0_10_0_10.9.png b/bin/assets/ui/uitheme/uitheme_combobox_button_menter.0_10_0_10.9.png
new file mode 100644
index 000000000..5b1286370
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_combobox_button_menter.0_10_0_10.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_button_menter_d.png b/bin/assets/ui/uitheme/uitheme_combobox_button_menter_d.png
deleted file mode 100644
index 055f2b12b..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_button_menter_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_button_menter_m.png b/bin/assets/ui/uitheme/uitheme_combobox_button_menter_m.png
deleted file mode 100644
index 6caee78dd..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_button_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_button_menter_u.png b/bin/assets/ui/uitheme/uitheme_combobox_button_menter_u.png
deleted file mode 100644
index 46a5287bc..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_button_menter_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_button_normal.0_10_0_10.9.png b/bin/assets/ui/uitheme/uitheme_combobox_button_normal.0_10_0_10.9.png
new file mode 100644
index 000000000..714e80e6d
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_combobox_button_normal.0_10_0_10.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_button_normal_d.png b/bin/assets/ui/uitheme/uitheme_combobox_button_normal_d.png
deleted file mode 100644
index 0ae02f612..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_button_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_button_normal_m.png b/bin/assets/ui/uitheme/uitheme_combobox_button_normal_m.png
deleted file mode 100644
index 96ba80e5b..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_button_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_button_normal_u.png b/bin/assets/ui/uitheme/uitheme_combobox_button_normal_u.png
deleted file mode 100644
index 8c619f4f6..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_button_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal.4_10_3_10.9.png b/bin/assets/ui/uitheme/uitheme_combobox_normal.4_10_3_10.9.png
new file mode 100644
index 000000000..60a33fb8d
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_combobox_normal.4_10_3_10.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_d.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_d.png
deleted file mode 100644
index 09bb94394..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_dl.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_dl.png
deleted file mode 100644
index 02c0e76dc..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_dr.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_dr.png
deleted file mode 100644
index 5eeb70024..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_m.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_m.png
deleted file mode 100644
index 558225b5c..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_ml.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_ml.png
deleted file mode 100644
index 6d3cef0c1..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_mr.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_mr.png
deleted file mode 100644
index 57c608a21..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_u.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_u.png
deleted file mode 100644
index 1268ef4bc..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_ul.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_ul.png
deleted file mode 100644
index 58e68887f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_combobox_normal_ur.png b/bin/assets/ui/uitheme/uitheme_combobox_normal_ur.png
deleted file mode 100644
index ef7e56c94..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_combobox_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter.3_11_25_11.9.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter.3_11_25_11.9.png
new file mode 100644
index 000000000..e14e21fb0
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter.3_11_25_11.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_d.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_d.png
deleted file mode 100644
index 5d1e8178d..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_dl.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_dl.png
deleted file mode 100644
index b54ecfcac..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_dr.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_dr.png
deleted file mode 100644
index 0ceb1d327..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_m.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_m.png
deleted file mode 100644
index 5cebe34b8..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ml.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ml.png
deleted file mode 100644
index 1e70910a4..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_mr.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_mr.png
deleted file mode 100644
index 8f7bd9efe..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_u.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_u.png
deleted file mode 100644
index 635be1984..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ul.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ul.png
deleted file mode 100644
index 1f7e6cf69..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ur.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ur.png
deleted file mode 100644
index 802e6b577..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal.3_11_25_11.9.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal.3_11_25_11.9.png
new file mode 100644
index 000000000..5a512d0c9
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal.3_11_25_11.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_d.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_d.png
deleted file mode 100644
index 395a25332..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_dl.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_dl.png
deleted file mode 100644
index a545f91b5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_dr.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_dr.png
deleted file mode 100644
index 35670f65e..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_m.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_m.png
deleted file mode 100644
index b565941d3..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ml.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ml.png
deleted file mode 100644
index f4e5d37ea..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_mr.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_mr.png
deleted file mode 100644
index 29a718c53..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_u.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_u.png
deleted file mode 100644
index 8c3a22244..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ul.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ul.png
deleted file mode 100644
index a3d1b050c..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ur.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ur.png
deleted file mode 100644
index 25e9756da..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_dropdownlist_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal.5_1_5_1.9.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal.5_1_5_1.9.png
new file mode 100644
index 000000000..54a4df23c
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_genericgrid_normal.5_1_5_1.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_d.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_d.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_dl.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_dl.png
deleted file mode 100644
index 4425c27d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_dr.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_dr.png
deleted file mode 100644
index 4425c27d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_m.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_m.png
deleted file mode 100644
index 7e8088deb..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ml.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ml.png
deleted file mode 100644
index 1db4d4b69..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_mr.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_mr.png
deleted file mode 100644
index a60535023..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_u.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_u.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ul.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ul.png
deleted file mode 100644
index 4425c27d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ur.png b/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ur.png
deleted file mode 100644
index 4425c27d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_genericgrid_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter.5_0_5_0.9.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter.5_0_5_0.9.png
new file mode 100644
index 000000000..ab9c412d8
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter.5_0_5_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_m.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_m.png
deleted file mode 100644
index ea76696a9..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_ml.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_ml.png
deleted file mode 100644
index d9a794f44..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_mr.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_mr.png
deleted file mode 100644
index 32e144037..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal.5_0_5_0.9.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal.5_0_5_0.9.png
new file mode 100644
index 000000000..a92bc8e53
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal.5_0_5_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_m.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_m.png
deleted file mode 100644
index dafbfc619..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_ml.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_ml.png
deleted file mode 100644
index 1299d4b1f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_mr.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_mr.png
deleted file mode 100644
index 65d45b733..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hscrollbar_button_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hslider_bg_normal.7_0_7_0.9.png b/bin/assets/ui/uitheme/uitheme_hslider_bg_normal.7_0_7_0.9.png
new file mode 100644
index 000000000..b787bdb65
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_hslider_bg_normal.7_0_7_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_m.png b/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_m.png
deleted file mode 100644
index 5019ce87e..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_ml.png b/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_ml.png
deleted file mode 100644
index 5d6595e07..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_mr.png b/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_mr.png
deleted file mode 100644
index 7359b9b9f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_hslider_bg_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal.1_1_1_1.9.png b/bin/assets/ui/uitheme/uitheme_listbox_normal.1_1_1_1.9.png
new file mode 100644
index 000000000..4a2b87247
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_listbox_normal.1_1_1_1.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_d.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_d.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_dl.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_dl.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_dr.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_dr.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_m.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_m.png
deleted file mode 100644
index 7e8088deb..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_ml.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_ml.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_mr.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_mr.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_u.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_u.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_ul.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_ul.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_listbox_normal_ur.png b/bin/assets/ui/uitheme/uitheme_listbox_normal_ur.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_listbox_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_menuitem_normal.6_0_2_0.9.png b/bin/assets/ui/uitheme/uitheme_menuitem_normal.6_0_2_0.9.png
new file mode 100644
index 000000000..7c593a93b
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_menuitem_normal.6_0_2_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_menuitem_normal_m.png b/bin/assets/ui/uitheme/uitheme_menuitem_normal_m.png
deleted file mode 100644
index 48c91e7bf..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_menuitem_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_menuitem_normal_ml.png b/bin/assets/ui/uitheme/uitheme_menuitem_normal_ml.png
deleted file mode 100644
index 8dfc48565..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_menuitem_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_menuitem_normal_mr.png b/bin/assets/ui/uitheme/uitheme_menuitem_normal_mr.png
deleted file mode 100644
index cd65ec7ba..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_menuitem_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_menuitem_selected.5_0_2_0.9.png b/bin/assets/ui/uitheme/uitheme_menuitem_selected.5_0_2_0.9.png
new file mode 100644
index 000000000..25bf50e8b
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_menuitem_selected.5_0_2_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_menuitem_selected_m.png b/bin/assets/ui/uitheme/uitheme_menuitem_selected_m.png
deleted file mode 100644
index 7babf4521..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_menuitem_selected_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_menuitem_selected_ml.png b/bin/assets/ui/uitheme/uitheme_menuitem_selected_ml.png
deleted file mode 100644
index 20f209181..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_menuitem_selected_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_menuitem_selected_mr.png b/bin/assets/ui/uitheme/uitheme_menuitem_selected_mr.png
deleted file mode 100644
index 97365c034..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_menuitem_selected_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_progressbar_normal.2_0_2_0.9.png b/bin/assets/ui/uitheme/uitheme_progressbar_normal.2_0_2_0.9.png
new file mode 100644
index 000000000..e3e804a07
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_progressbar_normal.2_0_2_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_progressbar_normal_m.png b/bin/assets/ui/uitheme/uitheme_progressbar_normal_m.png
deleted file mode 100644
index 3c0b2bfef..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_progressbar_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_progressbar_normal_ml.png b/bin/assets/ui/uitheme/uitheme_progressbar_normal_ml.png
deleted file mode 100644
index 487194267..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_progressbar_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_progressbar_normal_mr.png b/bin/assets/ui/uitheme/uitheme_progressbar_normal_mr.png
deleted file mode 100644
index 27d48c235..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_progressbar_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_separator_normal.5_0_5_0.9.png b/bin/assets/ui/uitheme/uitheme_separator_normal.5_0_5_0.9.png
new file mode 100644
index 000000000..6f01aca45
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_separator_normal.5_0_5_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_separator_normal_m.png b/bin/assets/ui/uitheme/uitheme_separator_normal_m.png
deleted file mode 100644
index 380900d17..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_separator_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_separator_normal_ml.png b/bin/assets/ui/uitheme/uitheme_separator_normal_ml.png
deleted file mode 100644
index db4ec440b..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_separator_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_separator_normal_mr.png b/bin/assets/ui/uitheme/uitheme_separator_normal_mr.png
deleted file mode 100644
index 02362435d..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_separator_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal.3_3_0_3.9.png b/bin/assets/ui/uitheme/uitheme_spinbox_input_normal.3_3_0_3.9.png
new file mode 100644
index 000000000..5f9266a2c
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_spinbox_input_normal.3_3_0_3.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_d.png b/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_d.png
deleted file mode 100644
index 62a6b347b..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_dl.png b/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_dl.png
deleted file mode 100644
index 3a5fe5df6..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_m.png b/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_m.png
deleted file mode 100644
index 51fd0c03c..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_ml.png b/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_ml.png
deleted file mode 100644
index 038b44066..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_u.png b/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_u.png
deleted file mode 100644
index 0850563d0..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_ul.png b/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_ul.png
deleted file mode 100644
index 5291124e3..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_spinbox_input_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tab_normal.2_0_3_0.9.png b/bin/assets/ui/uitheme/uitheme_tab_normal.2_0_3_0.9.png
new file mode 100644
index 000000000..9a577e124
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_tab_normal.2_0_3_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_tab_normal_m.png b/bin/assets/ui/uitheme/uitheme_tab_normal_m.png
deleted file mode 100644
index 7d157f89d..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tab_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tab_normal_ml.png b/bin/assets/ui/uitheme/uitheme_tab_normal_ml.png
deleted file mode 100644
index c9641e0c8..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tab_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tab_normal_mr.png b/bin/assets/ui/uitheme/uitheme_tab_normal_mr.png
deleted file mode 100644
index b30c9fcfe..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tab_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tab_selected.2_0_2_0.9.png b/bin/assets/ui/uitheme/uitheme_tab_selected.2_0_2_0.9.png
new file mode 100644
index 000000000..970b2ca7e
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_tab_selected.2_0_2_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_tab_selected_m.png b/bin/assets/ui/uitheme/uitheme_tab_selected_m.png
deleted file mode 100644
index 1ce7b455c..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tab_selected_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tab_selected_ml.png b/bin/assets/ui/uitheme/uitheme_tab_selected_ml.png
deleted file mode 100644
index c956471d7..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tab_selected_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tab_selected_mr.png b/bin/assets/ui/uitheme/uitheme_tab_selected_mr.png
deleted file mode 100644
index fb2698e83..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tab_selected_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal.3_0_3_3.9.png b/bin/assets/ui/uitheme/uitheme_tabcontainer_normal.3_0_3_3.9.png
new file mode 100644
index 000000000..d006647f6
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_tabcontainer_normal.3_0_3_3.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_d.png b/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_d.png
deleted file mode 100644
index ac5309589..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_dl.png b/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_dl.png
deleted file mode 100644
index 2bc860296..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_dr.png b/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_dr.png
deleted file mode 100644
index b0214506e..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_ml.png b/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_ml.png
deleted file mode 100644
index 1edcc113a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_mr.png b/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_mr.png
deleted file mode 100644
index 1edcc113a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tabcontainer_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal.5_1_5_1.9.png b/bin/assets/ui/uitheme/uitheme_textedit_normal.5_1_5_1.9.png
new file mode 100644
index 000000000..54a4df23c
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_textedit_normal.5_1_5_1.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_d.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_d.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_dl.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_dl.png
deleted file mode 100644
index 4425c27d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_dr.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_dr.png
deleted file mode 100644
index 4425c27d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_m.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_m.png
deleted file mode 100644
index 7e8088deb..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_ml.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_ml.png
deleted file mode 100644
index 1db4d4b69..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_mr.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_mr.png
deleted file mode 100644
index a60535023..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_u.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_u.png
deleted file mode 100644
index de6b1c88f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_ul.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_ul.png
deleted file mode 100644
index 4425c27d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textedit_normal_ur.png b/bin/assets/ui/uitheme/uitheme_textedit_normal_ur.png
deleted file mode 100644
index 4425c27d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textedit_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal.3_3_3_3.9.png b/bin/assets/ui/uitheme/uitheme_textinput_normal.3_3_3_3.9.png
new file mode 100644
index 000000000..6bddba084
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_textinput_normal.3_3_3_3.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_d.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_d.png
deleted file mode 100644
index a9e1c932a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_dl.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_dl.png
deleted file mode 100644
index 6a42e01a3..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_dr.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_dr.png
deleted file mode 100644
index 2a4e47ba4..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_m.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_m.png
deleted file mode 100644
index b4892a36f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_ml.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_ml.png
deleted file mode 100644
index 9e47d43cf..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_mr.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_mr.png
deleted file mode 100644
index 497283978..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_u.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_u.png
deleted file mode 100644
index 7bf38f1e5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_ul.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_ul.png
deleted file mode 100644
index a74b8a6f3..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_textinput_normal_ur.png b/bin/assets/ui/uitheme/uitheme_textinput_normal_ur.png
deleted file mode 100644
index 8dbc80593..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_textinput_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal.2_2_2_3.9.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal.2_2_2_3.9.png
new file mode 100644
index 000000000..bb6164fe1
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_tooltip_normal.2_2_2_3.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_d.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_d.png
deleted file mode 100644
index b9bbe287a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_dl.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_dl.png
deleted file mode 100644
index 4da52f189..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_dr.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_dr.png
deleted file mode 100644
index f64793dfd..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_m.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_m.png
deleted file mode 100644
index fa55c6f87..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_ml.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_ml.png
deleted file mode 100644
index 307b4b64b..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_mr.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_mr.png
deleted file mode 100644
index af7c4e18a..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_u.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_u.png
deleted file mode 100644
index 2ae41c9fc..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_ul.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_ul.png
deleted file mode 100644
index 2d630ce1c..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_tooltip_normal_ur.png b/bin/assets/ui/uitheme/uitheme_tooltip_normal_ur.png
deleted file mode 100644
index 9e11b2c82..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_tooltip_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter.0_5_0_5.9.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter.0_5_0_5.9.png
new file mode 100644
index 000000000..64e0b3b29
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter.0_5_0_5.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_d.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_d.png
deleted file mode 100644
index 2ae4b78b1..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_m.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_m.png
deleted file mode 100644
index b36806bb4..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_u.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_u.png
deleted file mode 100644
index 9b0fbad7b..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal.0_5_0_5.9.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal.0_5_0_5.9.png
new file mode 100644
index 000000000..7ef68adcc
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal.0_5_0_5.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_d.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_d.png
deleted file mode 100644
index d722ed3d5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_m.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_m.png
deleted file mode 100644
index 70f468863..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_u.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_u.png
deleted file mode 100644
index ac1d81187..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vscrollbar_button_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vslider_bg_normal.0_7_0_7.9.png b/bin/assets/ui/uitheme/uitheme_vslider_bg_normal.0_7_0_7.9.png
new file mode 100644
index 000000000..a2923bfd0
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_vslider_bg_normal.0_7_0_7.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_d.png b/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_d.png
deleted file mode 100644
index 05caf386d..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_m.png b/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_m.png
deleted file mode 100644
index f47847d13..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_u.png b/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_u.png
deleted file mode 100644
index bd069bbe2..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_vslider_bg_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_windeco_normal.3_0_3_0.9.png b/bin/assets/ui/uitheme/uitheme_windeco_normal.3_0_3_0.9.png
new file mode 100644
index 000000000..8d00af197
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_windeco_normal.3_0_3_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_windeco_normal_m.png b/bin/assets/ui/uitheme/uitheme_windeco_normal_m.png
deleted file mode 100644
index 1a84cce25..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_windeco_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_windeco_normal_ml.png b/bin/assets/ui/uitheme/uitheme_windeco_normal_ml.png
deleted file mode 100644
index 99e4eb40e..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_windeco_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_windeco_normal_mr.png b/bin/assets/ui/uitheme/uitheme_windeco_normal_mr.png
deleted file mode 100644
index 2df14482f..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_windeco_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_winmenubutton_selected.2_0_2_0.9.png b/bin/assets/ui/uitheme/uitheme_winmenubutton_selected.2_0_2_0.9.png
new file mode 100644
index 000000000..4cc746e2a
Binary files /dev/null and b/bin/assets/ui/uitheme/uitheme_winmenubutton_selected.2_0_2_0.9.png differ
diff --git a/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_m.png b/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_m.png
deleted file mode 100644
index 9c1259ef9..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_ml.png b/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_ml.png
deleted file mode 100644
index 8ca33ecc5..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_mr.png b/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_mr.png
deleted file mode 100644
index 7016ff6fa..000000000
Binary files a/bin/assets/ui/uitheme/uitheme_winmenubutton_selected_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme1.5x.eta b/bin/assets/ui/uitheme1.5x.eta
new file mode 100644
index 000000000..34c26915b
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x.eta differ
diff --git a/bin/assets/ui/uitheme1.5x.png b/bin/assets/ui/uitheme1.5x.png
new file mode 100644
index 000000000..f6acf049a
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_mdown.6_4_6_4.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_mdown.6_4_6_4.9.png
new file mode 100644
index 000000000..c85358dfa
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_mdown.6_4_6_4.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_menter.6_4_6_4.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_menter.6_4_6_4.9.png
new file mode 100644
index 000000000..aeb9db7fb
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_menter.6_4_6_4.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_normal.6_4_6_4.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_normal.6_4_6_4.9.png
new file mode 100644
index 000000000..8866fff51
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_normal.6_4_6_4.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_selected.6_4_6_4.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_selected.6_4_6_4.9.png
new file mode 100644
index 000000000..f464d83be
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_button_selected.6_4_6_4.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_checkbox_active_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_checkbox_active_normal.png
new file mode 100644
index 000000000..0ce0beb64
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_checkbox_active_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_checkbox_inactive_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_checkbox_inactive_normal.png
new file mode 100644
index 000000000..46fd5dd19
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_checkbox_inactive_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_button_menter.0_15_0_15.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_button_menter.0_15_0_15.9.png
new file mode 100644
index 000000000..a885ae298
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_button_menter.0_15_0_15.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_button_normal.0_15_0_15.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_button_normal.0_15_0_15.9.png
new file mode 100644
index 000000000..8d1c5a37c
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_button_normal.0_15_0_15.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_normal.6_15_4_15.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_normal.6_15_4_15.9.png
new file mode 100644
index 000000000..3228e1025
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_normal.6_15_4_15.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_dropdownlist_menter.4_16_37_16.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_dropdownlist_menter.4_16_37_16.9.png
new file mode 100644
index 000000000..10b5e155a
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_dropdownlist_menter.4_16_37_16.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_dropdownlist_normal.4_16_37_16.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_dropdownlist_normal.4_16_37_16.9.png
new file mode 100644
index 000000000..6b593b464
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_dropdownlist_normal.4_16_37_16.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_genericgrid_normal.7_1_7_1.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_genericgrid_normal.7_1_7_1.9.png
new file mode 100644
index 000000000..1dc48cb68
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_genericgrid_normal.7_1_7_1.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_menter.png
new file mode 100644
index 000000000..38611343d
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_selected.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_selected.png
new file mode 100644
index 000000000..f46c350cb
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_selected.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_bg_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_bg_normal.png
new file mode 100644
index 000000000..1aa9b496e
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_bg_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_menter.png
new file mode 100644
index 000000000..58dd6c5ee
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_normal.png
new file mode 100644
index 000000000..2bb3c5333
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_menter.png
new file mode 100644
index 000000000..47b82c681
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_normal.png
new file mode 100644
index 000000000..3e982bdb8
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_button_menter.7_0_7_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_button_menter.7_0_7_0.9.png
new file mode 100644
index 000000000..0d5fb274e
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_button_menter.7_0_7_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_button_normal.7_0_7_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_button_normal.7_0_7_0.9.png
new file mode 100644
index 000000000..1cc53f82d
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_button_normal.7_0_7_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_bg_normal.10_0_10_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_bg_normal.10_0_10_0.9.png
new file mode 100644
index 000000000..ee84cc814
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_bg_normal.10_0_10_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_menter.png
new file mode 100644
index 000000000..1255435f8
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_normal.png
new file mode 100644
index 000000000..5939f5534
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_add.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_add.png
new file mode 100644
index 000000000..0252c94d6
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_add.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_cancel.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_cancel.png
new file mode 100644
index 000000000..1a5fab28e
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_cancel.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-close.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-close.png
new file mode 100644
index 000000000..6f3786d57
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-close.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-new.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-new.png
new file mode 100644
index 000000000..ef187c2b5
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-new.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-open.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-open.png
new file mode 100644
index 000000000..8587ab339
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-open.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-save-as.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-save-as.png
new file mode 100644
index 000000000..e89e8c508
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-save-as.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-save.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-save.png
new file mode 100644
index 000000000..0faabe295
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_document-save.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_go-up.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_go-up.png
new file mode 100644
index 000000000..d127bab85
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_go-up.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_ok.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_ok.png
new file mode 100644
index 000000000..55f1c2cae
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_ok.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_quit.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_quit.png
new file mode 100644
index 000000000..cf8ad0ae3
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_quit.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_remove.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_remove.png
new file mode 100644
index 000000000..1a5fab28e
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_remove.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-in.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-in.png
new file mode 100644
index 000000000..211c8cd8d
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-in.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-original.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-original.png
new file mode 100644
index 000000000..ec12fc003
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-original.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-out.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-out.png
new file mode 100644
index 000000000..2e3664615
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_icon_zoom-out.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_listbox_normal.1_1_1_1.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_listbox_normal.1_1_1_1.9.png
new file mode 100644
index 000000000..7c120c414
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_listbox_normal.1_1_1_1.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_menter.png
new file mode 100644
index 000000000..38611343d
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_selected.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_selected.png
new file mode 100644
index 000000000..f46c350cb
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_selected.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_menter.png
new file mode 100644
index 000000000..5e5fded0e
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_normal.png
new file mode 100644
index 000000000..6be51d4d1
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_menter.png
new file mode 100644
index 000000000..3866b6b3c
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_normal.png
new file mode 100644
index 000000000..00cf6069b
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuitem_normal.9_0_3_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuitem_normal.9_0_3_0.9.png
new file mode 100644
index 000000000..6c6311d99
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuitem_normal.9_0_3_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuitem_selected.7_0_3_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuitem_selected.7_0_3_0.9.png
new file mode 100644
index 000000000..512d8a8e6
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuitem_selected.7_0_3_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_progressbar_filler_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_progressbar_filler_normal.png
new file mode 100644
index 000000000..9b9214b82
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_progressbar_filler_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_progressbar_normal.3_0_3_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_progressbar_normal.3_0_3_0.9.png
new file mode 100644
index 000000000..e7f55fe21
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_progressbar_normal.3_0_3_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_radiobutton_active_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_radiobutton_active_normal.png
new file mode 100644
index 000000000..f8c5926a8
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_radiobutton_active_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_radiobutton_inactive_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_radiobutton_inactive_normal.png
new file mode 100644
index 000000000..a2fa8838d
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_radiobutton_inactive_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_separator_normal.7_0_7_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_separator_normal.7_0_7_0.9.png
new file mode 100644
index 000000000..88368333a
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_separator_normal.7_0_7_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_mdown.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_mdown.png
new file mode 100644
index 000000000..c285eaac5
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_mdown.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_menter.png
new file mode 100644
index 000000000..ac3bf8d6c
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_normal.png
new file mode 100644
index 000000000..79407b0cb
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_mdown.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_mdown.png
new file mode 100644
index 000000000..99dc151c5
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_mdown.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_menter.png
new file mode 100644
index 000000000..03cfb334f
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_normal.png
new file mode 100644
index 000000000..7ca26099e
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_input_normal.4_4_0_4.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_input_normal.4_4_0_4.9.png
new file mode 100644
index 000000000..a0f458710
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_input_normal.4_4_0_4.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_tab_normal.3_0_4_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_tab_normal.3_0_4_0.9.png
new file mode 100644
index 000000000..e50ff7f9d
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_tab_normal.3_0_4_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_tab_selected.3_0_3_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_tab_selected.3_0_3_0.9.png
new file mode 100644
index 000000000..8903551c7
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_tab_selected.3_0_3_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_tabcontainer_normal.4_0_4_4.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_tabcontainer_normal.4_0_4_4.9.png
new file mode 100644
index 000000000..eed5f8364
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_tabcontainer_normal.4_0_4_4.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_textedit_box_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_textedit_box_normal.png
new file mode 100644
index 000000000..953692395
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_textedit_box_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_textedit_normal.7_1_7_1.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_textedit_normal.7_1_7_1.9.png
new file mode 100644
index 000000000..1dc48cb68
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_textedit_normal.7_1_7_1.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_textinput_normal.4_4_4_4.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_textinput_normal.4_4_4_4.9.png
new file mode 100644
index 000000000..d5500315e
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_textinput_normal.4_4_4_4.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_tooltip_normal.3_3_3_4.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_tooltip_normal.3_3_3_4.9.png
new file mode 100644
index 000000000..9c04a958d
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_tooltip_normal.3_3_3_4.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_bg_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_bg_normal.png
new file mode 100644
index 000000000..88be14eac
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_bg_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_menter.png
new file mode 100644
index 000000000..3bd94b123
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_normal.png
new file mode 100644
index 000000000..11d89fa2b
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_menter.png
new file mode 100644
index 000000000..6dfb54f97
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_normal.png
new file mode 100644
index 000000000..e9f673935
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_button_menter.0_7_0_7.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_button_menter.0_7_0_7.9.png
new file mode 100644
index 000000000..3d3c1580c
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_button_menter.0_7_0_7.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_button_normal.0_7_0_7.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_button_normal.0_7_0_7.9.png
new file mode 100644
index 000000000..9657441f7
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_button_normal.0_7_0_7.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_bg_normal.0_10_0_10.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_bg_normal.0_10_0_10.9.png
new file mode 100644
index 000000000..9bca25ef8
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_bg_normal.0_10_0_10.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_menter.png
new file mode 100644
index 000000000..70c29bc38
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_normal.png
new file mode 100644
index 000000000..84a33f288
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winback_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winback_normal.png
new file mode 100644
index 000000000..7ec6b21e0
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winback_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderbottom_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderbottom_normal.png
new file mode 100644
index 000000000..d08f9ba91
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderbottom_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderleft_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderleft_normal.png
new file mode 100644
index 000000000..d08f9ba91
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderleft_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderright_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderright_normal.png
new file mode 100644
index 000000000..d08f9ba91
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winborderright_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_menter.png
new file mode 100644
index 000000000..2796a7986
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_normal.png
new file mode 100644
index 000000000..4928c57b5
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_windeco_normal.4_0_4_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_windeco_normal.4_0_4_0.9.png
new file mode 100644
index 000000000..17abfbfd5
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_windeco_normal.4_0_4_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_menter.png
new file mode 100644
index 000000000..107a4058e
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_normal.png
new file mode 100644
index 000000000..9bea52a04
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmenu_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmenu_normal.png
new file mode 100644
index 000000000..b1cc45d44
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmenu_normal.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmenubutton_selected.3_0_3_0.9.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmenubutton_selected.3_0_3_0.9.png
new file mode 100644
index 000000000..c9961f3b7
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmenubutton_selected.3_0_3_0.9.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_menter.png
new file mode 100644
index 000000000..e70dd20ec
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_menter.png differ
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_normal.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_normal.png
new file mode 100644
index 000000000..70cd951fd
Binary files /dev/null and b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_normal.png differ
diff --git a/bin/assets/ui/uitheme2x.eta b/bin/assets/ui/uitheme2x.eta
index b5ce1613f..90e92ebe8 100644
Binary files a/bin/assets/ui/uitheme2x.eta and b/bin/assets/ui/uitheme2x.eta differ
diff --git a/bin/assets/ui/uitheme2x.png b/bin/assets/ui/uitheme2x.png
index cdf7c8613..78c0713f1 100644
Binary files a/bin/assets/ui/uitheme2x.png and b/bin/assets/ui/uitheme2x.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown.8_6_8_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown.8_6_8_6.9.png
new file mode 100644
index 000000000..0886bce55
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown.8_6_8_6.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_d.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_d.png
deleted file mode 100644
index a176612c1..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_dl.png
deleted file mode 100644
index 90f1a68e0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_dr.png
deleted file mode 100644
index 3da886898..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_m.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_m.png
deleted file mode 100644
index eb0b4bd1c..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ml.png
deleted file mode 100644
index 235ea38a9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_mr.png
deleted file mode 100644
index 9e555f472..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_u.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_u.png
deleted file mode 100644
index aa653fc6f..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ul.png
deleted file mode 100644
index 9ef2da994..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ur.png
deleted file mode 100644
index 7988d04e5..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter.8_6_8_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter.8_6_8_6.9.png
new file mode 100644
index 000000000..36594ba03
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_button_menter.8_6_8_6.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_d.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_d.png
deleted file mode 100644
index 2ca125f00..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_dl.png
deleted file mode 100644
index b78f5be33..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_dr.png
deleted file mode 100644
index d937b3569..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_m.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_m.png
deleted file mode 100644
index da6b69abe..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ml.png
deleted file mode 100644
index e5301ce49..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_mr.png
deleted file mode 100644
index 9fd9ac670..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_u.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_u.png
deleted file mode 100644
index 747e5ec88..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ul.png
deleted file mode 100644
index fc8bc39f4..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ur.png
deleted file mode 100644
index 4318374e1..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_menter_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal.8_6_8_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal.8_6_8_6.9.png
new file mode 100644
index 000000000..fd053334c
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_button_normal.8_6_8_6.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_d.png
deleted file mode 100644
index 1eaa74d60..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_dl.png
deleted file mode 100644
index b78f5be33..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_dr.png
deleted file mode 100644
index d937b3569..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_m.png
deleted file mode 100644
index 7df4e932b..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ml.png
deleted file mode 100644
index 99b4ab468..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_mr.png
deleted file mode 100644
index 63efdc57a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_u.png
deleted file mode 100644
index 08c2c5e88..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ul.png
deleted file mode 100644
index 74dc56148..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ur.png
deleted file mode 100644
index 64e125ef6..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected.8_6_8_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected.8_6_8_6.9.png
new file mode 100644
index 000000000..7fab77949
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_button_selected.8_6_8_6.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_d.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_d.png
deleted file mode 100644
index fd8eaeef1..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_dl.png
deleted file mode 100644
index 1f0d52df6..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_dr.png
deleted file mode 100644
index ec0489ebd..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_m.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_m.png
deleted file mode 100644
index d0a454d88..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ml.png
deleted file mode 100644
index 2cc0e4cbd..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_mr.png
deleted file mode 100644
index 6f7f61acf..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_u.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_u.png
deleted file mode 100644
index 7da09a302..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ul.png
deleted file mode 100644
index b08588d14..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ur.png
deleted file mode 100644
index bf34dbaa6..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_button_selected_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter.0_20_0_20.9.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter.0_20_0_20.9.png
new file mode 100644
index 000000000..4d4add233
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter.0_20_0_20.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_d.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_d.png
deleted file mode 100644
index b499e1af6..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_m.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_m.png
deleted file mode 100644
index 9ddfba114..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_u.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_u.png
deleted file mode 100644
index 826f48a4a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal.0_20_0_20.9.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal.0_20_0_20.9.png
new file mode 100644
index 000000000..9f929aaf8
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal.0_20_0_20.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_d.png
deleted file mode 100644
index e71405a21..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_m.png
deleted file mode 100644
index 180b87540..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_u.png
deleted file mode 100644
index 413e4b753..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_button_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal.8_20_6_20.9.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal.8_20_6_20.9.png
new file mode 100644
index 000000000..2c562f70a
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal.8_20_6_20.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_d.png
deleted file mode 100644
index 68c99ec93..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_dl.png
deleted file mode 100644
index 4df36cf38..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_dr.png
deleted file mode 100644
index f1621ed77..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_m.png
deleted file mode 100644
index d70b7ed0a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ml.png
deleted file mode 100644
index aeacbbdb8..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_mr.png
deleted file mode 100644
index b7560befd..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_u.png
deleted file mode 100644
index 827e5bec9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ul.png
deleted file mode 100644
index 26e097205..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ur.png
deleted file mode 100644
index ba274abff..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_combobox_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter.6_22_50_22.9.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter.6_22_50_22.9.png
new file mode 100644
index 000000000..4442713dd
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter.6_22_50_22.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_d.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_d.png
deleted file mode 100644
index 45d3b138c..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_dl.png
deleted file mode 100644
index 059b80fe2..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_dr.png
deleted file mode 100644
index 56d76d163..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_m.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_m.png
deleted file mode 100644
index 2ee22d132..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ml.png
deleted file mode 100644
index 1789794b5..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_mr.png
deleted file mode 100644
index 619a1a19d..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_u.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_u.png
deleted file mode 100644
index c3cadffc1..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ul.png
deleted file mode 100644
index 0194b61e1..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ur.png
deleted file mode 100644
index 200d4aa24..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal.6_22_50_22.9.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal.6_22_50_22.9.png
new file mode 100644
index 000000000..01501d6af
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal.6_22_50_22.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_d.png
deleted file mode 100644
index 5dc3f6508..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_dl.png
deleted file mode 100644
index 258498203..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_dr.png
deleted file mode 100644
index f8ba09cbf..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_m.png
deleted file mode 100644
index 1db9b7f3a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ml.png
deleted file mode 100644
index 073db62b3..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_mr.png
deleted file mode 100644
index 612920fad..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_u.png
deleted file mode 100644
index 989ebbf9f..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ul.png
deleted file mode 100644
index 4830a3435..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ur.png
deleted file mode 100644
index ef72e811e..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal.10_2_10_2.9.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal.10_2_10_2.9.png
new file mode 100644
index 000000000..429623885
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal.10_2_10_2.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_d.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_dl.png
deleted file mode 100644
index 8edf14963..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_dr.png
deleted file mode 100644
index 8edf14963..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_m.png
deleted file mode 100644
index 88e10832a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ml.png
deleted file mode 100644
index 083365039..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_mr.png
deleted file mode 100644
index ac34db3a9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_u.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ul.png
deleted file mode 100644
index 8edf14963..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ur.png
deleted file mode 100644
index 8edf14963..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_genericgrid_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter.10_0_10_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter.10_0_10_0.9.png
new file mode 100644
index 000000000..5a93a39db
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter.10_0_10_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_m.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_m.png
deleted file mode 100644
index c83bbd64c..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_ml.png
deleted file mode 100644
index 54bdb1f16..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_mr.png
deleted file mode 100644
index 6ba1281fa..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal.10_0_10_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal.10_0_10_0.9.png
new file mode 100644
index 000000000..cf9335100
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal.10_0_10_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_m.png
deleted file mode 100644
index 2457f638d..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_ml.png
deleted file mode 100644
index 0654a4e98..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_mr.png
deleted file mode 100644
index 4d4e42d3c..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal.14_0_14_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal.14_0_14_0.9.png
new file mode 100644
index 000000000..2706ff777
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal.14_0_14_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_m.png
deleted file mode 100644
index 149691507..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_ml.png
deleted file mode 100644
index 589607e4a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_mr.png
deleted file mode 100644
index 42a48a71d..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_hslider_bg_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal.2_2_2_2.9.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal.2_2_2_2.9.png
new file mode 100644
index 000000000..8fcd37534
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal.2_2_2_2.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_d.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_dl.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_dr.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_m.png
deleted file mode 100644
index 88e10832a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ml.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_mr.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_u.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ul.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ur.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_listbox_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal.12_0_4_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal.12_0_4_0.9.png
new file mode 100644
index 000000000..e17844575
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal.12_0_4_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_m.png
deleted file mode 100644
index 902c8d258..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_ml.png
deleted file mode 100644
index 8fa47ac9a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_mr.png
deleted file mode 100644
index a57be85b9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected.10_0_4_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected.10_0_4_0.9.png
new file mode 100644
index 000000000..d84d27812
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected.10_0_4_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_m.png b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_m.png
deleted file mode 100644
index 7384e8740..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_ml.png
deleted file mode 100644
index 4d691f4d3..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_mr.png
deleted file mode 100644
index 9c17f43bb..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_menuitem_selected_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal.4_0_4_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal.4_0_4_0.9.png
new file mode 100644
index 000000000..369aaca93
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal.4_0_4_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_m.png
deleted file mode 100644
index cfc4b3d16..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_ml.png
deleted file mode 100644
index 76f589fd6..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_mr.png
deleted file mode 100644
index 8c22d6ec5..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_progressbar_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_separator_normal.10_0_10_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_separator_normal.10_0_10_0.9.png
new file mode 100644
index 000000000..4196f28f0
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_separator_normal.10_0_10_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_m.png
deleted file mode 100644
index 7e7db74b1..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_ml.png
deleted file mode 100644
index f5382a879..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_mr.png
deleted file mode 100644
index db3d831ab..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_separator_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal.6_6_0_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal.6_6_0_6.9.png
new file mode 100644
index 000000000..121f4ff8d
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal.6_6_0_6.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_d.png
deleted file mode 100644
index 1694c0b8a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_dl.png
deleted file mode 100644
index 88e69e088..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_m.png
deleted file mode 100644
index 0a569a5ca..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_ml.png
deleted file mode 100644
index 7ecf0acc9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_u.png
deleted file mode 100644
index 9d5898981..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_ul.png
deleted file mode 100644
index 51b891800..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_input_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tab_normal.4_0_6_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_tab_normal.4_0_6_0.9.png
new file mode 100644
index 000000000..430b2101b
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_tab_normal.4_0_6_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_m.png
deleted file mode 100644
index 28899a679..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_ml.png
deleted file mode 100644
index 37b0423e3..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_mr.png
deleted file mode 100644
index 880ce25ad..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tab_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tab_selected.4_0_4_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_tab_selected.4_0_4_0.9.png
new file mode 100644
index 000000000..9913d0293
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_tab_selected.4_0_4_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_m.png b/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_m.png
deleted file mode 100644
index f287007f6..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_ml.png
deleted file mode 100644
index 273885039..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_mr.png
deleted file mode 100644
index 1df29c614..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tab_selected_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal.6_0_6_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal.6_0_6_6.9.png
new file mode 100644
index 000000000..918fff0c3
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal.6_0_6_6.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_d.png
deleted file mode 100644
index a0631f206..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_dl.png
deleted file mode 100644
index a9b580f83..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_dr.png
deleted file mode 100644
index 953aa61f9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_ml.png
deleted file mode 100644
index 2b696c4e9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_mr.png
deleted file mode 100644
index 2b696c4e9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tabcontainer_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal.10_2_10_2.9.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal.10_2_10_2.9.png
new file mode 100644
index 000000000..429623885
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal.10_2_10_2.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_d.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_dl.png
deleted file mode 100644
index 8edf14963..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_dr.png
deleted file mode 100644
index 8edf14963..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_m.png
deleted file mode 100644
index 88e10832a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ml.png
deleted file mode 100644
index 083365039..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_mr.png
deleted file mode 100644
index ac34db3a9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_u.png
deleted file mode 100644
index 5cb046fb0..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ul.png
deleted file mode 100644
index 8edf14963..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ur.png
deleted file mode 100644
index 8edf14963..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textedit_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal.6_6_6_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal.6_6_6_6.9.png
new file mode 100644
index 000000000..9b7df6cbf
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal.6_6_6_6.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_d.png
deleted file mode 100644
index 8b97e7a66..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_dl.png
deleted file mode 100644
index df7c472f9..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_dr.png
deleted file mode 100644
index c8494e6de..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_m.png
deleted file mode 100644
index 247d492da..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ml.png
deleted file mode 100644
index e87b8683c..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_mr.png
deleted file mode 100644
index da112e920..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_u.png
deleted file mode 100644
index 535b21696..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ul.png
deleted file mode 100644
index e7f212b7f..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ur.png
deleted file mode 100644
index 074f540bf..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_textinput_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal.4_4_4_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal.4_4_4_6.9.png
new file mode 100644
index 000000000..e3f31f95a
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal.4_4_4_6.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_d.png
deleted file mode 100644
index 01c522d0a..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_dl.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_dl.png
deleted file mode 100644
index ac000e453..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_dl.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_dr.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_dr.png
deleted file mode 100644
index 59d53d6e8..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_dr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_m.png
deleted file mode 100644
index 15e81c808..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ml.png
deleted file mode 100644
index ef5b9f824..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_mr.png
deleted file mode 100644
index 499caab63..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_u.png
deleted file mode 100644
index 77e184b53..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ul.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ul.png
deleted file mode 100644
index 89df3e83b..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ul.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ur.png b/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ur.png
deleted file mode 100644
index 3c5bdf7c6..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_tooltip_normal_ur.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter.0_10_0_10.9.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter.0_10_0_10.9.png
new file mode 100644
index 000000000..bedf89fd5
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter.0_10_0_10.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_d.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_d.png
deleted file mode 100644
index a5bb8e8f2..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_m.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_m.png
deleted file mode 100644
index c65781d48..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_u.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_u.png
deleted file mode 100644
index aed60b832..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal.0_10_0_10.9.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal.0_10_0_10.9.png
new file mode 100644
index 000000000..97997ce76
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal.0_10_0_10.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_d.png
deleted file mode 100644
index 0e2942251..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_m.png
deleted file mode 100644
index fd6e555d3..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_u.png
deleted file mode 100644
index 58af7b051..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal.0_14_0_14.9.png b/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal.0_14_0_14.9.png
new file mode 100644
index 000000000..a014b73b5
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal.0_14_0_14.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_d.png b/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_d.png
deleted file mode 100644
index 22ef825ba..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_d.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_m.png
deleted file mode 100644
index f9fc5d341..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_u.png b/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_u.png
deleted file mode 100644
index cad9fefde..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_vslider_bg_normal_u.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal.6_0_6_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal.6_0_6_0.9.png
new file mode 100644
index 000000000..161053569
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal.6_0_6_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_m.png b/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_m.png
deleted file mode 100644
index b9088d032..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_ml.png
deleted file mode 100644
index 9aa512f68..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_mr.png
deleted file mode 100644
index 8f9fcf8c6..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_windeco_normal_mr.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected.4_0_4_0.9.png b/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected.4_0_4_0.9.png
new file mode 100644
index 000000000..5af3feacd
Binary files /dev/null and b/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected.4_0_4_0.9.png differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_m.png b/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_m.png
deleted file mode 100644
index 08bd1e4f2..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_m.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_ml.png b/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_ml.png
deleted file mode 100644
index 286cf0817..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_ml.png and /dev/null differ
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_mr.png b/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_mr.png
deleted file mode 100644
index 09099b817..000000000
Binary files a/bin/assets/ui/uitheme2x/uitheme2x_winmenubutton_selected_mr.png and /dev/null differ
diff --git a/include/eepp/core/string.hpp b/include/eepp/core/string.hpp
index b79c9d132..b2bdabdd3 100644
--- a/include/eepp/core/string.hpp
+++ b/include/eepp/core/string.hpp
@@ -81,6 +81,12 @@ class EE_API String {
 	/** Split a string and hold it on a vector */
 	static std::vector < std::string > split( const std::string& str, const Int8& splitchar = '\n', const bool& pushEmptyString = false );
 
+	/** Joins a string vector into a single string */
+	static std::string join( const std::vector<std::string>& strArray, const Int8& joinchar = ' ', const bool& appendLastJoinChar = false );
+
+	/** Joins a string vector into a single string */
+	static String join( const std::vector<String>& strArray, const Int8& joinchar = ' ', const bool& appendLastJoinChar = false );
+
 	/** Remove the first space ( or the specified character ) on the string */
 	static std::string lTrim( const std::string & str, char character = ' ' );
 
diff --git a/include/eepp/graphics/drawableresource.hpp b/include/eepp/graphics/drawableresource.hpp
new file mode 100644
index 000000000..0e776b6c6
--- /dev/null
+++ b/include/eepp/graphics/drawableresource.hpp
@@ -0,0 +1,33 @@
+#ifndef EE_GRAPHICS_DRAWABLERESOURCE_HPP 
+#define EE_GRAPHICS_DRAWABLERESOURCE_HPP
+
+#include <eepp/core.hpp>
+#include <eepp/graphics/drawable.hpp>
+
+namespace  EE { namespace Graphics {
+
+class EE_API DrawableResource : public Drawable
+{
+	public:
+		/** @return The DrawableResource Id. The Id is the String::hash of the SubTexture name. */
+		const Uint32& getId() const;
+
+		/** @return The DrawableResource Name. */
+		const std::string getName() const;
+
+		/** Sets the DrawableResource Name, it will also change the Id. */
+		void setName( const std::string& name );
+	protected:
+		std::string mName;
+		Uint32		mId;
+
+		DrawableResource( EE_DRAWABLE_TYPE drawableType );
+
+		DrawableResource( EE_DRAWABLE_TYPE drawableType, const std::string& name );
+
+		void createUnnamed();
+};
+
+}}
+
+#endif
diff --git a/include/eepp/graphics/ninepatch.hpp b/include/eepp/graphics/ninepatch.hpp
index 3adc99f01..370667592 100644
--- a/include/eepp/graphics/ninepatch.hpp
+++ b/include/eepp/graphics/ninepatch.hpp
@@ -7,7 +7,7 @@
 
 namespace EE { namespace Graphics {
 
-class EE_API NinePatch : public Drawable {
+class EE_API NinePatch : public DrawableResource {
 	public:
 		enum NinePatchSides {
 			Left = 0,
@@ -22,9 +22,9 @@ class EE_API NinePatch : public Drawable {
 			SideCount
 		};
 
-		NinePatch( const Uint32& TexId, int left, int top, int right, int bottom );
+		NinePatch( const Uint32& TexId, int left, int top, int right, int bottom, const Float& pixelDensity = 1, const std::string& name = "" );
 		
-		NinePatch( SubTexture * subTexture, int left, int top, int right, int bottom );
+		NinePatch( SubTexture * subTexture, int left, int top, int right, int bottom, const std::string& name = "" );
 
 		~NinePatch();
 		
@@ -35,12 +35,25 @@ class EE_API NinePatch : public Drawable {
 		virtual void draw( const Vector2f& position );
 
 		virtual void draw( const Vector2f& position, const Sizef& size );
+
+		SubTexture *	getSubTexture( const int& side );
 	protected:
-		Drawable * 	mDrawable[ SideCount ];
+		SubTexture * 	mDrawable[ SideCount ];
 		Rect mRect;
+		Rectf mRectf;
 		Sizei mSize;
+		Sizef mDestSize;
+		Float mPixelDensity;
 
 		void createFromTexture( const Uint32& TexId, int left, int top, int right, int bottom );
+
+		virtual void onAlphaChange();
+
+		virtual void onColorFilterChange();
+
+		void updatePosition();
+
+		void updateSize();
 };
 
 }}
diff --git a/include/eepp/graphics/ninepatchmanager.hpp b/include/eepp/graphics/ninepatchmanager.hpp
new file mode 100644
index 000000000..a44311f5b
--- /dev/null
+++ b/include/eepp/graphics/ninepatchmanager.hpp
@@ -0,0 +1,17 @@
+#ifndef EE_GRAPHICS_NINEPATCHMANAGER_HPP
+#define EE_GRAPHICS_NINEPATCHMANAGER_HPP
+
+#include <eepp/graphics/base.hpp>
+#include <eepp/graphics/ninepatch.hpp>
+
+namespace EE { namespace Graphics {
+
+class EE_API NinePatchManager : public ResourceManager<NinePatch> {
+	SINGLETON_DECLARE_HEADERS(NinePatchManager)
+
+	~NinePatchManager();
+};
+
+}}
+
+#endif
diff --git a/include/eepp/graphics/subtexture.hpp b/include/eepp/graphics/subtexture.hpp
index de0e0a146..a927562c0 100644
--- a/include/eepp/graphics/subtexture.hpp
+++ b/include/eepp/graphics/subtexture.hpp
@@ -4,12 +4,12 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/texture.hpp>
 #include <eepp/math/originpoint.hpp>
-#include <eepp/graphics/drawable.hpp>
+#include <eepp/graphics/drawableresource.hpp>
 
 namespace EE { namespace Graphics {
 
 /** @brief A SubTexture is a part of a texture that represent an sprite.*/
-class EE_API SubTexture : public Drawable {
+class EE_API SubTexture : public DrawableResource {
 	public:
 		/** Creates an empty SubTexture */
 		SubTexture();
@@ -46,15 +46,6 @@ class EE_API SubTexture : public Drawable {
 
 		virtual ~SubTexture();
 
-		/** @return The SubTexture Id. The Id is the String::hash of the SubTexture name. */
-		const Uint32& getId() const;
-
-		/** @return The SubTexture Name. */
-		const std::string getName() const;
-
-		/** Sets the SubTexture Name, it will also change the Id. */
-		void setName( const std::string& name );
-
 		/** @return The Texture Id that holds the SubTexture. */
 		const Uint32& getTextureId();
 
@@ -165,8 +156,6 @@ class EE_API SubTexture : public Drawable {
 	protected:
 		Uint8 *		mPixels;
 		Uint8 *		mAlphaMask;
-		std::string mName;
-		Uint32		mId;
 		Uint32 		mTexId;
 		Graphics::Texture * 	mTexture;
 		Rect		mSrcRect;
@@ -174,8 +163,6 @@ class EE_API SubTexture : public Drawable {
 		Sizef		mDestSize;
 		Vector2i	mOffset;
 		Float		mPixelDensity;
-
-		void createUnnamed();
 };
 
 }}
diff --git a/include/eepp/ui/uiskin.hpp b/include/eepp/ui/uiskin.hpp
index 0bf30cc40..6c0ba9239 100644
--- a/include/eepp/ui/uiskin.hpp
+++ b/include/eepp/ui/uiskin.hpp
@@ -54,9 +54,9 @@ class EE_API UISkin {
 
 		const Uint32& getType() const;
 
-		virtual Sizei getBorderSize( const Uint32 & state ) = 0;
+		virtual Rect getBorderSize( const Uint32 & state ) = 0;
 
-		virtual Sizei getBorderSize();
+		virtual Rect getBorderSize();
 	protected:
 		friend class UIControl;
 		friend class UISkinState;
diff --git a/include/eepp/ui/uiskincomplex.hpp b/include/eepp/ui/uiskincomplex.hpp
index 2a7f56a2e..a22bc746e 100644
--- a/include/eepp/ui/uiskincomplex.hpp
+++ b/include/eepp/ui/uiskincomplex.hpp
@@ -49,12 +49,12 @@ class EE_API UISkinComplex : public UISkin {
 
 		Sizei getSize( const Uint32& state );
 
-		Sizei getBorderSize( const Uint32 &state );
+		Rect getBorderSize( const Uint32 &state );
 	protected:
 		Drawable * 	mDrawable[ UISkinState::StateCount ][ SideCount ];
 		Color		mTempColor;
 		Sizei		mSize[ UISkinState::StateCount ];
-		Sizei		mBorderSize[ UISkinState::StateCount ];
+		Rect		mBorderSize[ UISkinState::StateCount ];
 
 		void cacheSize();
 
diff --git a/include/eepp/ui/uiskinsimple.hpp b/include/eepp/ui/uiskinsimple.hpp
index 60da4c736..9da34ca59 100644
--- a/include/eepp/ui/uiskinsimple.hpp
+++ b/include/eepp/ui/uiskinsimple.hpp
@@ -30,7 +30,7 @@ class EE_API UISkinSimple : public UISkin {
 
 		Sizei getSize( const Uint32& state );
 
-		Sizei getBorderSize( const Uint32 & state );
+		Rect getBorderSize( const Uint32 & state );
 	protected:
 		Drawable * 	mDrawable[ UISkinState::StateCount ];
 		Color		mTempColor;
diff --git a/include/eepp/ui/uitheme.hpp b/include/eepp/ui/uitheme.hpp
index 5bdb163db..1690f94d3 100644
--- a/include/eepp/ui/uitheme.hpp
+++ b/include/eepp/ui/uitheme.hpp
@@ -27,11 +27,11 @@ class EE_API UITheme : protected ResourceManager<UISkin> {
 
 		static UITheme * loadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtlas * getTextureAtlas );
 
-		static UITheme * loadFromFile( UITheme * tTheme, const std::string& Path );
+		static UITheme * loadFromFile( UITheme * tTheme, const std::string& Path, const Float& pixelDensity = 1 );
 
 		static UITheme * loadFromTextureAtlas( Graphics::TextureAtlas * getTextureAtlas, const std::string& Name, const std::string NameAbbr );
 
-		static UITheme * loadFromFile( const std::string& Path, const std::string& Name, const std::string& NameAbbr );
+		static UITheme * loadFromFile( const std::string& Path, const std::string& Name, const std::string& NameAbbr, const Float& pixelDensity = 1 );
 
 		void addThemeElement( const std::string& Element );
 
diff --git a/projects/android-project/build.sh b/projects/android-project/build.sh
index b21bbde9e..8e594bacf 100755
--- a/projects/android-project/build.sh
+++ b/projects/android-project/build.sh
@@ -5,6 +5,6 @@ export NDK_PROJECT_PATH=$(dirname "$0")
 ndk-build NDK_LOG=1 NDK_DEBUG=1 -j`nproc`
 rm -rf ./bin
 rm -rf ./gen
-#ant debug
-#adb install -r bin/eepp-app-debug.apk
+ant debug
+adb install -r bin/eepp-app-debug.apk
 #ndk-gdb --force --start --verbose
diff --git a/projects/linux/ee.files b/projects/linux/ee.files
index fbebf8082..7c1d6d430 100644
--- a/projects/linux/ee.files
+++ b/projects/linux/ee.files
@@ -3,6 +3,7 @@
 ../../include/eepp/graphics/convexshapedrawable.hpp
 ../../include/eepp/graphics/drawable.hpp
 ../../include/eepp/graphics/drawablegroup.hpp
+../../include/eepp/graphics/drawableresource.hpp
 ../../include/eepp/graphics/drawablesearcher.hpp
 ../../include/eepp/graphics/font.hpp
 ../../include/eepp/graphics/fontstyleconfig.hpp
@@ -10,6 +11,7 @@
 ../../include/eepp/graphics/fonttruetypeloader.hpp
 ../../include/eepp/graphics/graphicshelper.hpp
 ../../include/eepp/graphics/ninepatch.hpp
+../../include/eepp/graphics/ninepatchmanager.hpp
 ../../include/eepp/graphics/primitivedrawable.hpp
 ../../include/eepp/graphics/rectangledrawable.hpp
 ../../include/eepp/graphics/renderer/base.hpp
@@ -47,7 +49,9 @@
 ../../include/eepp/ui/uiwidgetcreator.hpp
 ../../src/eepp/graphics/convexshapedrawable.cpp
 ../../src/eepp/graphics/drawablegroup.cpp
+../../src/eepp/graphics/drawableresource.cpp
 ../../src/eepp/graphics/ninepatch.cpp
+../../src/eepp/graphics/ninepatchmanager.cpp
 ../../src/eepp/maps/mapobjectlayer.cpp
 ../../src/eepp/graphics/arcdrawable.cpp
 ../../src/eepp/graphics/circledrawable.cpp
diff --git a/src/eepp/core/string.cpp b/src/eepp/core/string.cpp
index c7667c308..b62c87c94 100644
--- a/src/eepp/core/string.cpp
+++ b/src/eepp/core/string.cpp
@@ -93,6 +93,40 @@ std::vector < std::string > String::split ( const std::string& str, const Int8&
 	return tmp;
 }
 
+std::string String::join( const std::vector<std::string> & strArray, const Int8 & joinchar, const bool& appendLastJoinChar ) {
+	size_t s = strArray.size();
+	std::string str;
+
+	if ( s > 0 ) {
+		for ( size_t i = 0; i < s; i++ ) {
+			str += strArray[i];
+
+			if ( i != s - 1 || appendLastJoinChar ) {
+				str += joinchar;
+			}
+		}
+	}
+
+	return str;
+}
+
+String String::join( const std::vector<String> & strArray, const Int8 & joinchar, const bool& appendLastJoinChar ) {
+	size_t s = strArray.size();
+	String str;
+
+	if ( s > 0 ) {
+		for ( size_t i = 0; i < s; i++ ) {
+			str += strArray[i];
+
+			if ( i != s - 1 || appendLastJoinChar ) {
+				str += joinchar;
+			}
+		}
+	}
+
+	return str;
+}
+
 std::string String::lTrim(const std::string & str , char character) {
 	std::string::size_type pos1 = str.find_first_not_of(character);
 	return ( pos1 == std::string::npos ) ? str : str.substr( pos1 );
diff --git a/src/eepp/graphics/drawableresource.cpp b/src/eepp/graphics/drawableresource.cpp
new file mode 100644
index 000000000..cd4bf9d06
--- /dev/null
+++ b/src/eepp/graphics/drawableresource.cpp
@@ -0,0 +1,37 @@
+#include <eepp/graphics/drawableresource.hpp>
+
+namespace EE { namespace Graphics {
+
+DrawableResource::DrawableResource( EE_DRAWABLE_TYPE drawableType ) :
+	Drawable( drawableType ),
+	mId(0)
+{
+	createUnnamed();
+}
+
+DrawableResource::DrawableResource( EE_DRAWABLE_TYPE drawableType, const std::string& name ) :
+	Drawable( drawableType ),
+	mId(0)
+{
+	setName( name );
+}
+
+const Uint32& DrawableResource::getId() const {
+	return mId;
+}
+
+const std::string DrawableResource::getName() const {
+	return mName;
+}
+
+void DrawableResource::setName( const std::string& name ) {
+	mName = name;
+	mId = String::hash( mName );
+}
+
+void DrawableResource::createUnnamed() {
+	if ( !mName.size() )
+		setName( std::string( "unnamed" ) );
+}
+
+}} 
diff --git a/src/eepp/graphics/drawablesearcher.cpp b/src/eepp/graphics/drawablesearcher.cpp
index b6ad83ba5..1fc79ad18 100644
--- a/src/eepp/graphics/drawablesearcher.cpp
+++ b/src/eepp/graphics/drawablesearcher.cpp
@@ -2,6 +2,7 @@
 #include <eepp/graphics/globaltextureatlas.hpp>
 #include <eepp/graphics/textureatlasmanager.hpp>
 #include <eepp/graphics/texturefactory.hpp>
+#include <eepp/graphics/ninepatchmanager.hpp>
 #include <eepp/graphics/sprite.hpp>
 
 namespace EE { namespace Graphics {
@@ -26,6 +27,10 @@ static Drawable * searchByNameInternal( const std::string& name ) {
 	Uint32 id = String::hash( name );
 	Drawable * drawable = TextureAtlasManager::instance()->getSubTextureById( id );
 
+	if ( NULL == drawable) {
+		drawable = NinePatchManager::instance()->getById( id );
+	}
+
 	if ( NULL == drawable ) {
 		drawable = TextureFactory::instance()->getByHash( id );
 	}
@@ -48,6 +53,8 @@ Drawable * DrawableSearcher::searchByName( const std::string& name ) {
 				drawable = getSprite( name.substr( 8 ) );
 			} else if ( String::startsWith( name, "@drawable/" ) ) {
 				drawable = searchByNameInternal( name.substr( 10 ) );
+			} else if ( String::startsWith( name, "@9p/" ) ) {
+				drawable = NinePatchManager::instance()->getByName( name.substr( 4 ) );
 			} else {
 				drawable = searchByNameInternal( name );
 			}
diff --git a/src/eepp/graphics/ninepatch.cpp b/src/eepp/graphics/ninepatch.cpp
index a2502fe8b..2f90cf79c 100644
--- a/src/eepp/graphics/ninepatch.cpp
+++ b/src/eepp/graphics/ninepatch.cpp
@@ -3,9 +3,10 @@
 
 namespace EE { namespace Graphics {
 
-NinePatch::NinePatch( const Uint32& TexId, int left, int top, int right, int bottom ) :
-	Drawable( DRAWABLE_NINEPATCH ),
-	mRect( left, top, right, bottom )
+NinePatch::NinePatch(const Uint32& TexId, int left, int top, int right, int bottom, const Float & pixelDensity, const std::string& name ) :
+	DrawableResource( DRAWABLE_NINEPATCH, name ),
+	mRect( left, top, right, bottom ),
+	mPixelDensity( pixelDensity )
 {
 	for ( Int32 i = 0; i < SideCount; i++ )
 		mDrawable[ i ] = NULL;
@@ -19,9 +20,10 @@ NinePatch::NinePatch( const Uint32& TexId, int left, int top, int right, int bot
 	}
 }
 
-NinePatch::NinePatch( SubTexture * subTexture, int left, int top, int right, int bottom ):
-	Drawable( DRAWABLE_NINEPATCH ),
-	mRect( left, top, right, bottom )
+NinePatch::NinePatch( SubTexture * subTexture, int left, int top, int right, int bottom, const std::string& name ):
+	DrawableResource( DRAWABLE_NINEPATCH, name ),
+	mRect( left, top, right, bottom ),
+	mPixelDensity(1)
 {
 	for ( Int32 i = 0; i < SideCount; i++ )
 		mDrawable[ i ] = NULL;
@@ -29,6 +31,8 @@ NinePatch::NinePatch( SubTexture * subTexture, int left, int top, int right, int
 	Texture * tex;
 
 	if ( NULL != subTexture && ( tex = subTexture->getTexture() ) != NULL ) {
+		mPixelDensity = subTexture->getPixelDensity();
+
 		Rect r( subTexture->getSrcRect() );
 
 		mSize = r.getSize();
@@ -38,6 +42,8 @@ NinePatch::NinePatch( SubTexture * subTexture, int left, int top, int right, int
 		for ( int i = 0; i  < SideCount; i++ ) {
 			SubTexture * side = static_cast<SubTexture*>( mDrawable[i] );
 
+			side->setPixelDensity( subTexture->getPixelDensity() );
+
 			Rect sideRect = side->getSrcRect();
 
 			sideRect.Left += r.Left;
@@ -56,7 +62,7 @@ NinePatch::~NinePatch() {
 }
 
 Sizef NinePatch::getSize() {
-	return Sizef( mSize.getWidth(), mSize.getHeight() );
+	return Sizef( (Float)((Int32)( mSize.getWidth() / mPixelDensity ) ), (Float)((Int32)( mSize.getHeight() / mPixelDensity ) ) );
 }
 
 void NinePatch::draw() {
@@ -64,19 +70,35 @@ void NinePatch::draw() {
 }
 
 void NinePatch::draw( const Vector2f& position ) {
-	draw( position, getSize() );
+	draw( position, mDestSize );
 }
 
 void NinePatch::draw( const Vector2f& position, const Sizef& size ) {
-	mDrawable[ UpLeft ]->draw( position );
-	mDrawable[ Left ]->draw( Vector2f( position.x, position.y + mRect.Top ), Sizef( mRect.Left, size.getHeight() - mRect.Top - mRect.Bottom ) );
-	mDrawable[ DownLeft ]->draw( Vector2f( position.x, position.y + size.getHeight() - mRect.Bottom ) );
-	mDrawable[ Up ]->draw( Vector2f( position.x + mRect.Left, position.y ), Sizef( size.getWidth() - mRect.Left - mRect.Right, mRect.Top ) );
-	mDrawable[ Center ]->draw( Vector2f( position.x + mRect.Left, position.y + mRect.Top ), Sizef( size.getWidth() - mRect.Left - mRect.Right, size.getHeight() - mRect.Top - mRect.Bottom ) );
-	mDrawable[ Down ]->draw( Vector2f( position.x + mRect.Left, position.y + size.getHeight() - mRect.Bottom ), Sizef( size.getWidth() - mRect.Left - mRect.Right, mRect.Bottom ) );
-	mDrawable[ UpRight ]->draw( Vector2f( position.x + size.getWidth() - mRect.Right, position.y ) );
-	mDrawable[ Right ]->draw( Vector2f( position.x + size.getWidth() - mRect.Right, position.y + mRect.Top ), Vector2f( mRect.Right, size.getHeight() - mRect.Top - mRect.Bottom ) );
-	mDrawable[ DownRight ]->draw( Vector2f( position.x + size.getWidth() - mRect.Right, position.y + size.getHeight() - mRect.Bottom ) );
+	bool sizeChanged = false;
+
+	if ( size != mDestSize ) {
+		sizeChanged = true;
+		mDestSize = size;
+		updateSize();
+	}
+
+	if ( position != mPosition || sizeChanged ) {
+		mPosition = position;
+		updatePosition();
+	}
+
+	for ( Int32 i = 0; i < SideCount; i++ ) {
+		Sizef destSize( mDrawable[i]->getDestSize() );
+
+		if ( destSize.getWidth() > 0 && destSize.getHeight() > 0 )
+			mDrawable[ i ]->draw();
+	}
+}
+
+SubTexture * NinePatch::getSubTexture( const int& side ) {
+	if ( side < SideCount )
+		return mDrawable[ side ];
+	return NULL;
 }
 
 void NinePatch::createFromTexture(const Uint32 & TexId, int left, int top, int right, int bottom) {
@@ -89,6 +111,53 @@ void NinePatch::createFromTexture(const Uint32 & TexId, int left, int top, int r
 	mDrawable[ DownLeft] = eeNew( SubTexture, ( TexId, Rect( 0, mSize.getHeight() - bottom, left, mSize.getHeight() ) ) );
 	mDrawable[ DownRight ] = eeNew( SubTexture, ( TexId, Rect( mSize.getWidth() - right, mSize.getHeight() - bottom, mSize.getWidth(), mSize.getHeight() ) ) );
 	mDrawable[ Center ] = eeNew( SubTexture, ( TexId, Rect( left, top, mSize.getWidth() - right, mSize.getHeight() - bottom ) ) );
+
+	mRect = Rect( left, top, right, bottom );
+
+	mRectf = Rectf( eeceil( mRect.Left / mPixelDensity * PixelDensity::getPixelDensity() ),
+				eeceil( mRect.Top / mPixelDensity * PixelDensity::getPixelDensity() ),
+				eeceil( mRect.Right / mPixelDensity * PixelDensity::getPixelDensity() ),
+				eeceil( mRect.Bottom / mPixelDensity * PixelDensity::getPixelDensity() )
+	);
+
+	mDestSize = getSize();
+
+	updatePosition();
+	updateSize();
+}
+
+void NinePatch::onAlphaChange() {
+	for ( Int32 i = 0; i < SideCount; i++ )
+		mDrawable[ i ]->setAlpha( mColor.a );
+}
+
+void NinePatch::onColorFilterChange() {
+	for ( Int32 i = 0; i < SideCount; i++ )
+		mDrawable[ i ]->setColor( mColor );
+}
+
+void NinePatch::updateSize() {
+	mDrawable[ UpLeft ]->setDestSize( Sizef( mRectf.Left, mRectf.Top ) );
+	mDrawable[ Left ]->setDestSize( Sizef( mRectf.Left, mDestSize.getHeight() - mRectf.Top - mRectf.Bottom ) );
+	mDrawable[ DownLeft ]->setDestSize( Sizef( mRectf.Left, mRectf.Bottom ) );
+	mDrawable[ Up ]->setDestSize( Sizef( mDestSize.getWidth() - mRectf.Left - mRectf.Right, mRectf.Top ) );
+	mDrawable[ Center ]->setDestSize( Sizef( mDestSize.getWidth() - mRectf.Left - mRectf.Right, mDestSize.getHeight() - mRectf.Top - mRectf.Bottom ) );
+	mDrawable[ Down ]->setDestSize( Sizef( mDestSize.getWidth() - mRectf.Left - mRectf.Right, mRectf.Bottom ) );
+	mDrawable[ UpRight ]->setDestSize( Sizef( mRectf.Right, mRectf.Top ) );
+	mDrawable[ Right ]->setDestSize( Sizef( mRectf.Right, mDestSize.getHeight() - mRectf.Top - mRectf.Bottom ) );
+	mDrawable[ DownRight ]->setDestSize( Sizef( mRectf.Right, mRectf.Bottom ) );
+}
+
+void NinePatch::updatePosition() {
+	mDrawable[ UpLeft ]->setPosition( mPosition );
+	mDrawable[ Left ]->setPosition( Vector2f( mPosition.x, mPosition.y + mRectf.Top ) );
+	mDrawable[ DownLeft ]->setPosition( Vector2f( mPosition.x, mPosition.y + mDestSize.getHeight() - mRectf.Bottom ) );
+	mDrawable[ Up ]->setPosition( Vector2f( mPosition.x + mRectf.Left, mPosition.y ) );
+	mDrawable[ Center ]->setPosition( Vector2f( mPosition.x + mRectf.Left, mPosition.y + mRectf.Top ) );
+	mDrawable[ Down ]->setPosition( Vector2f( mPosition.x + mRectf.Left, mPosition.y + mDestSize.getHeight() - mRectf.Bottom ) );
+	mDrawable[ UpRight ]->setPosition( Vector2f( mPosition.x + mDestSize.getWidth() - mRectf.Right, mPosition.y ) );
+	mDrawable[ Right ]->setPosition( Vector2f( mPosition.x + mDestSize.getWidth() - mRectf.Right, mPosition.y + mRectf.Top ) );
+	mDrawable[ DownRight ]->setPosition( Vector2f( mPosition.x + mDestSize.getWidth() - mRectf.Right, mPosition.y + mDestSize.getHeight() - mRectf.Bottom ) );
 }
 
 }}
diff --git a/src/eepp/graphics/ninepatchmanager.cpp b/src/eepp/graphics/ninepatchmanager.cpp
new file mode 100644
index 000000000..0d4aeb768
--- /dev/null
+++ b/src/eepp/graphics/ninepatchmanager.cpp
@@ -0,0 +1,11 @@
+#include <eepp/graphics/ninepatchmanager.hpp>
+
+namespace EE { namespace Graphics {
+
+SINGLETON_DECLARE_IMPLEMENTATION(NinePatchManager)
+
+NinePatchManager::~NinePatchManager()
+{
+}
+
+}}
diff --git a/src/eepp/graphics/subtexture.cpp b/src/eepp/graphics/subtexture.cpp
index ca75e82e7..e37063596 100644
--- a/src/eepp/graphics/subtexture.cpp
+++ b/src/eepp/graphics/subtexture.cpp
@@ -10,10 +10,9 @@ using namespace EE::Graphics::Private;
 namespace EE { namespace Graphics {
 
 SubTexture::SubTexture() :
-	Drawable( DRAWABLE_SUBTEXTURE ),
+	DrawableResource( DRAWABLE_SUBTEXTURE ),
 	mPixels(NULL),
 	mAlphaMask(NULL),
-	mId(0),
 	mTexId(0),
 	mTexture(NULL),
 	mSrcRect( Rect(0,0,0,0) ),
@@ -22,15 +21,12 @@ SubTexture::SubTexture() :
 	mOffset(0,0),
 	mPixelDensity(1)
 {
-	createUnnamed();
 }
 
 SubTexture::SubTexture( const Uint32& TexId, const std::string& name ) :
-	Drawable( DRAWABLE_SUBTEXTURE ),
+	DrawableResource( DRAWABLE_SUBTEXTURE, name ),
 	mPixels(NULL),
 	mAlphaMask(NULL),
-	mName( name ),
-	mId( String::hash( mName ) ),
 	mTexId( TexId ),
 	mTexture( TextureFactory::instance()->getTexture( TexId ) ),
 	mSrcRect( Rect( 0, 0, NULL != mTexture ? mTexture->getImageWidth() : 0, NULL != mTexture ? mTexture->getImageHeight() : 0 ) ),
@@ -39,15 +35,12 @@ SubTexture::SubTexture( const Uint32& TexId, const std::string& name ) :
 	mOffset(0,0),
 	mPixelDensity(1)
 {
-	createUnnamed();
 }
 
 SubTexture::SubTexture( const Uint32& TexId, const Rect& SrcRect, const std::string& name ) :
-	Drawable( DRAWABLE_SUBTEXTURE ),
+	DrawableResource( DRAWABLE_SUBTEXTURE, name ),
 	mPixels(NULL),
 	mAlphaMask(NULL),
-	mName( name ),
-	mId( String::hash( mName ) ),
 	mTexId( TexId ),
 	mTexture( TextureFactory::instance()->getTexture( TexId ) ),
 	mSrcRect( SrcRect ),
@@ -56,15 +49,12 @@ SubTexture::SubTexture( const Uint32& TexId, const Rect& SrcRect, const std::str
 	mOffset(0,0),
 	mPixelDensity(1)
 {
-	createUnnamed();
 }
 
 SubTexture::SubTexture( const Uint32& TexId, const Rect& SrcRect, const Sizef& DestSize, const std::string& name ) :
-	Drawable( DRAWABLE_SUBTEXTURE ),
+	DrawableResource( DRAWABLE_SUBTEXTURE, name ),
 	mPixels(NULL),
 	mAlphaMask(NULL),
-	mName( name ),
-	mId( String::hash( mName ) ),
 	mTexId( TexId ),
 	mTexture( TextureFactory::instance()->getTexture( TexId ) ),
 	mSrcRect(SrcRect),
@@ -73,15 +63,12 @@ SubTexture::SubTexture( const Uint32& TexId, const Rect& SrcRect, const Sizef& D
 	mOffset(0,0),
 	mPixelDensity(1)
 {
-	createUnnamed();
 }
 
 SubTexture::SubTexture(const Uint32& TexId, const Rect& SrcRect, const Sizef& DestSize, const Vector2i &Offset, const std::string& name ) :
-	Drawable( DRAWABLE_SUBTEXTURE ),
+	DrawableResource( DRAWABLE_SUBTEXTURE, name ),
 	mPixels(NULL),
 	mAlphaMask(NULL),
-	mName( name ),
-	mId( String::hash( mName ) ),
 	mTexId( TexId ),
 	mTexture( TextureFactory::instance()->getTexture( TexId ) ),
 	mSrcRect(SrcRect),
@@ -90,31 +77,12 @@ SubTexture::SubTexture(const Uint32& TexId, const Rect& SrcRect, const Sizef& De
 	mOffset(Offset),
 	mPixelDensity(1)
 {
-	createUnnamed();
 }
 
 SubTexture::~SubTexture() {
 	clearCache();
 }
 
-void SubTexture::createUnnamed() {
-	if ( !mName.size() )
-		setName( std::string( "unnamed" ) );
-}
-
-const Uint32& SubTexture::getId() const {
-	return mId;
-}
-
-const std::string SubTexture::getName() const {
-	return mName;
-}
-
-void SubTexture::setName( const std::string& name ) {
-	mName = name;
-	mId = String::hash( mName );
-}
-
 const Uint32& SubTexture::getTextureId() {
 	return mTexId;
 }
diff --git a/src/eepp/ui/uicontrol.cpp b/src/eepp/ui/uicontrol.cpp
index a6033cbe6..a22d14065 100644
--- a/src/eepp/ui/uicontrol.cpp
+++ b/src/eepp/ui/uicontrol.cpp
@@ -1376,24 +1376,22 @@ Rect UIControl::makePadding( bool PadLeft, bool PadRight, bool PadTop, bool PadB
 
 	if ( mFlags & UI_AUTO_PADDING || SkipFlags ) {
 		if ( NULL != mSkinState && NULL != mSkinState->getSkin() ) {
-			if ( mSkinState->getSkin()->getType() == UISkin::SkinComplex ) {
-				UISkinComplex * tComplex = reinterpret_cast<UISkinComplex*> ( mSkinState->getSkin() );
+			Rect rPadding = mSkinState->getSkin()->getBorderSize( UISkinState::StateNormal );
 
-				if ( PadLeft ) {
-					tPadding.Left = tComplex->getSideSize( UISkinState::StateNormal, UISkinComplex::Left ).getWidth();
-				}
+			if ( PadLeft ) {
+				tPadding.Left = rPadding.Left;
+			}
 
-				if ( PadRight ) {
-					tPadding.Right = tComplex->getSideSize( UISkinState::StateNormal, UISkinComplex::Right ).getWidth();
-				}
+			if ( PadRight ) {
+				tPadding.Right = rPadding.Right;
+			}
 
-				if ( PadTop ) {
-					tPadding.Top = tComplex->getSideSize( UISkinState::StateNormal, UISkinComplex::Up ).getHeight();
-				}
+			if ( PadTop ) {
+				tPadding.Top = rPadding.Top;
+			}
 
-				if ( PadBottom ) {
-					tPadding.Bottom = tComplex->getSideSize( UISkinState::StateNormal, UISkinComplex::Down ).getHeight();
-				}
+			if ( PadBottom ) {
+				tPadding.Bottom = rPadding.Bottom;
 			}
 		}
 	}
diff --git a/src/eepp/ui/uipushbutton.cpp b/src/eepp/ui/uipushbutton.cpp
index 3869eb446..8b409a378 100644
--- a/src/eepp/ui/uipushbutton.cpp
+++ b/src/eepp/ui/uipushbutton.cpp
@@ -78,7 +78,7 @@ void UIPushButton::onSizeChange() {
 		Int32 txtW = NULL != mTextBox ? PixelDensity::pxToDpI( mTextBox->getTextWidth() ) : 0;
 		Int32 minSize = txtW + ( NULL != mIcon ? mIcon->getSize().getWidth() : 0 )
 						+ mStyleConfig.IconHorizontalMargin + mTextBox->getPadding().Left + mTextBox->getPadding().Right +
-						(  NULL != getSkin() ? getSkin()->getBorderSize().getWidth() : 0 );
+						(  NULL != getSkin() ? getSkin()->getBorderSize().Left + getSkin()->getBorderSize().Right : 0 );
 
 		if ( minSize > mSize.getWidth() ) {
 			setInternalWidth( minSize );
diff --git a/src/eepp/ui/uiskin.cpp b/src/eepp/ui/uiskin.cpp
index 5a7ee1b4d..70ffbe1d6 100644
--- a/src/eepp/ui/uiskin.cpp
+++ b/src/eepp/ui/uiskin.cpp
@@ -92,7 +92,7 @@ const Uint32& UISkin::getType() const {
 	return mType;
 }
 
-Sizei UISkin::getBorderSize() {
+Rect UISkin::getBorderSize() {
 	return getBorderSize( UISkinState::StateNormal );
 }
 
diff --git a/src/eepp/ui/uiskincomplex.cpp b/src/eepp/ui/uiskincomplex.cpp
index 14abd5339..d491c8981 100644
--- a/src/eepp/ui/uiskincomplex.cpp
+++ b/src/eepp/ui/uiskincomplex.cpp
@@ -229,14 +229,14 @@ Sizei UISkinComplex::getSize( const Uint32 & state ) {
 	return mSize[ state ];
 }
 
-Sizei UISkinComplex::getBorderSize(const Uint32 & state) {
+Rect UISkinComplex::getBorderSize(const Uint32 & state) {
 	return mBorderSize[ state ];
 }
 
 void UISkinComplex::cacheSize() {
 	for ( Int32 state = UISkinState::StateNormal; state < UISkinState::StateCount; state++ ) {
-		Int32 w = 0, bw = 0;
-		Int32 h = 0, bh = 0;
+		Int32 w = 0;
+		Int32 h = 0;
 
 		Drawable * tDrawable = mDrawable[ state ][ Center ];
 
@@ -249,32 +249,31 @@ void UISkinComplex::cacheSize() {
 
 		if ( NULL != tDrawable ) {
 			h += tDrawable->getSize().y;
-			bh += tDrawable->getSize().y;
+			mBorderSize[ state ].Top = tDrawable->getSize().y;
 		}
 
 		tDrawable = mDrawable[ state ][ Down ];
 
 		if ( NULL != tDrawable ) {
 			h += tDrawable->getSize().y;
-			bh += tDrawable->getSize().y;
+			mBorderSize[ state ].Bottom = tDrawable->getSize().y;
 		}
 
 		tDrawable = mDrawable[ state ][ Left ];
 
 		if ( NULL != tDrawable ) {
 			w += tDrawable->getSize().x;
-			bw += tDrawable->getSize().x;
+			mBorderSize[ state ].Left = tDrawable->getSize().x;
 		}
 
 		tDrawable = mDrawable[ state ][ Right ];
 
 		if ( NULL != tDrawable ) {
 			w += tDrawable->getSize().x;
-			bw += tDrawable->getSize().x;
+			mBorderSize[ state ].Right = tDrawable->getSize().x;
 		}
 
 		mSize[ state ] = Sizei( w, h );
-		mBorderSize[ state ] = Sizei( bw, bh );
 	}
 }
 
diff --git a/src/eepp/ui/uiskinsimple.cpp b/src/eepp/ui/uiskinsimple.cpp
index 6631a616f..ff1d593d4 100644
--- a/src/eepp/ui/uiskinsimple.cpp
+++ b/src/eepp/ui/uiskinsimple.cpp
@@ -1,5 +1,6 @@
 #include <eepp/ui/uiskinsimple.hpp>
 #include <eepp/graphics/drawable.hpp>
+#include <eepp/graphics/ninepatch.hpp>
 #include <eepp/graphics/drawablesearcher.hpp>
 
 namespace EE { namespace UI {
@@ -82,8 +83,18 @@ Sizei UISkinSimple::getSize( const Uint32 & state ) {
 	return Sizei();
 }
 
-Sizei UISkinSimple::getBorderSize( const Uint32 & state ) {
-	return Sizei();
+Rect UISkinSimple::getBorderSize( const Uint32 & state ) {
+	if ( NULL != mDrawable[ state ] && mDrawable[ state ]->getDrawableType() == DRAWABLE_NINEPATCH ) {
+		NinePatch * ninePatch( static_cast<NinePatch*>( mDrawable[ state ] ) );
+		SubTexture * stl( ninePatch->getSubTexture( NinePatch::Left ) );
+		SubTexture * str( ninePatch->getSubTexture( NinePatch::Right ) );
+		SubTexture * stt( ninePatch->getSubTexture( NinePatch::Up ) );
+		SubTexture * stb( ninePatch->getSubTexture( NinePatch::Down ) );
+		Rect size( stl->getSize().getWidth(), stt->getSize().getHeight(), str->getSize().getWidth(), stb->getSize().getHeight() );
+		return size;
+	}
+
+	return Rect();
 }
 
 }}
diff --git a/src/eepp/ui/uisubtexture.cpp b/src/eepp/ui/uisubtexture.cpp
index 07d33f2e6..ee7a66166 100644
--- a/src/eepp/ui/uisubtexture.cpp
+++ b/src/eepp/ui/uisubtexture.cpp
@@ -191,10 +191,10 @@ void UISubTexture::loadFromXmlNode(const pugi::xml_node & node) {
 		String::toLowerInPlace( name );
 
 		if ( "src" == name || "subtexture" == name ) {
-			SubTexture * res = NULL;
+			DrawableResource * res = NULL;
 
-			if ( NULL != ( res = GlobalTextureAtlas::instance()->getByName( ait->as_string() ) ) ) {
-				setSubTexture( res );
+			if ( NULL != ( res = GlobalTextureAtlas::instance()->getByName( ait->as_string() ) ) && res->getDrawableType() == DRAWABLE_SUBTEXTURE ) {
+				setSubTexture( static_cast<SubTexture*>( res ) );
 			}
 		} else if ( "scaletype" == name ) {
 			std::string val = ait->as_string();
diff --git a/src/eepp/ui/uitheme.cpp b/src/eepp/ui/uitheme.cpp
index 1c44d15e1..e66d7d2df 100644
--- a/src/eepp/ui/uitheme.cpp
+++ b/src/eepp/ui/uitheme.cpp
@@ -8,6 +8,8 @@
 #include <eepp/graphics/font.hpp>
 #include <eepp/graphics/texturefactory.hpp>
 #include <eepp/graphics/textureatlasmanager.hpp>
+#include <eepp/graphics/ninepatch.hpp>
+#include <eepp/graphics/ninepatchmanager.hpp>
 #include <eepp/system/filesystem.hpp>
 
 namespace EE { namespace UI {
@@ -69,16 +71,46 @@ UITheme * UITheme::loadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtla
 		std::string name( subTexture->getName() );
 
 		if ( String::startsWith( name, sAbbr ) ) {
-			std::vector<std::string> nameParts = String::split( name, '_' );
+			std::vector<std::string> dotParts = String::split( name, '.' );
 
-			if ( nameParts.size() >= 3 ) {
-				int lPart = nameParts.size() - 1;
-				int llPart = nameParts.size() - 2;
+			if ( dotParts.size() >= 3 && dotParts[ dotParts.size() - 1 ] == "9" ) {
+				std::string realName;
 
-				if ( UISkin::isStateName( nameParts[ lPart ] ) ) {
-					elemFound[ elemNameFromSkinSimple( nameParts ) ] = false;
-				} else if ( UISkin::isStateName( nameParts[ llPart ] ) && UISkinComplex::isSideSuffix( nameParts[ lPart ] ) ) {
-					elemFound[ elemNameFromSkinComplex( nameParts ) ] = true;
+				for ( size_t i = 0; i <  dotParts.size() - 2; i++ ) {
+					realName += dotParts[i];
+
+					if ( i != dotParts.size() - 3 ) {
+						realName += ".";
+					}
+				}
+
+				std::vector<std::string> nameParts = String::split( realName, '_' );
+
+				std::vector<std::string> srcRect = String::split( dotParts[ dotParts.size() - 2 ], '_' );
+				int l = 0, t = 0, r = 0, b = 0;
+
+				if ( srcRect.size() == 4 ) {
+					String::fromString<int>( l, srcRect[0] );
+					String::fromString<int>( t, srcRect[1] );
+					String::fromString<int>( r, srcRect[2] );
+					String::fromString<int>( b, srcRect[3] );
+				}
+
+				elemFound[ elemNameFromSkinSimple( nameParts ) ] = false;
+
+				NinePatchManager::instance()->add( eeNew( NinePatch, ( subTexture, l, t, r, b, realName ) ) );
+			} else {
+				std::vector<std::string> nameParts = String::split( name, '_' );
+
+				if ( nameParts.size() >= 3 ) {
+					int lPart = nameParts.size() - 1;
+					int llPart = nameParts.size() - 2;
+
+					if ( UISkin::isStateName( nameParts[ lPart ] ) ) {
+						elemFound[ elemNameFromSkinSimple( nameParts ) ] = false;
+					} else if ( UISkin::isStateName( nameParts[ llPart ] ) && UISkinComplex::isSideSuffix( nameParts[ lPart ] ) ) {
+						elemFound[ elemNameFromSkinComplex( nameParts ) ] = true;
+					}
 				}
 			}
 		}
@@ -96,7 +128,7 @@ UITheme * UITheme::loadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtla
 	return tTheme;
 }
 
-UITheme * UITheme::loadFromFile( UITheme * tTheme, const std::string& Path ) {
+UITheme * UITheme::loadFromFile(UITheme * tTheme, const std::string& Path , const Float & pixelDensity ) {
 	Clock TE;
 
 	std::string RPath( Path );
@@ -124,20 +156,50 @@ UITheme * UITheme::loadFromFile( UITheme * tTheme, const std::string& Path ) {
 			if ( String::startsWith( name, sAbbrIcon ) ) {
 				tSG->add( eeNew( SubTexture, ( TextureFactory::instance()->loadFromFile( fpath ), name ) ) );
 			} else if ( String::startsWith( name, sAbbr ) ) {
-				std::vector<std::string> nameParts = String::split( name, '_' );
+				std::vector<std::string> dotParts = String::split( name, '.' );
 
-				if ( nameParts.size() >= 3 ) {
-					int lPart = nameParts.size() - 1;
-					int llPart = nameParts.size() - 2;
+				if ( dotParts.size() >= 3 && dotParts[ dotParts.size() - 1 ] == "9" ) {
+					std::string realName;
 
-					if ( UISkin::isStateName( nameParts[ lPart ] ) ) {
-						elemFound[ elemNameFromSkinSimple( nameParts ) ] = false;
+					for ( size_t i = 0; i <  dotParts.size() - 2; i++ ) {
+						realName += dotParts[i];
 
-						tSG->add( eeNew( SubTexture, ( TextureFactory::instance()->loadFromFile( fpath ), name ) ) );
-					} else if ( UISkin::isStateName( nameParts[ llPart ] ) && UISkinComplex::isSideSuffix( nameParts[ lPart ] ) ) {
-						elemFound[ elemNameFromSkinComplex( nameParts ) ] = true;
+						if ( i != dotParts.size() - 3 ) {
+							realName += ".";
+						}
+					}
 
-						tSG->add( eeNew( SubTexture, ( TextureFactory::instance()->loadFromFile( fpath ), name ) ) );
+					std::vector<std::string> nameParts = String::split( realName, '_' );
+
+					std::vector<std::string> srcRect = String::split( dotParts[ dotParts.size() - 2 ], '_' );
+					int l = 0, t = 0, r = 0, b = 0;
+
+					if ( srcRect.size() == 4 ) {
+						String::fromString<int>( l, srcRect[0] );
+						String::fromString<int>( t, srcRect[1] );
+						String::fromString<int>( r, srcRect[2] );
+						String::fromString<int>( b, srcRect[3] );
+					}
+
+					elemFound[ elemNameFromSkinSimple( nameParts ) ] = false;
+
+					NinePatchManager::instance()->add( eeNew( NinePatch, ( TextureFactory::instance()->loadFromFile( fpath ), l, t, r, b, pixelDensity, realName ) ) );
+				} else {
+					std::vector<std::string> nameParts = String::split( name, '_' );
+
+					if ( nameParts.size() >= 3 ) {
+						int lPart = nameParts.size() - 1;
+						int llPart = nameParts.size() - 2;
+
+						if ( UISkin::isStateName( nameParts[ lPart ] ) ) {
+							elemFound[ elemNameFromSkinSimple( nameParts ) ] = false;
+
+							tSG->add( eeNew( SubTexture, ( TextureFactory::instance()->loadFromFile( fpath ), name ) ) );
+						} else if ( UISkin::isStateName( nameParts[ llPart ] ) && UISkinComplex::isSideSuffix( nameParts[ lPart ] ) ) {
+							elemFound[ elemNameFromSkinComplex( nameParts ) ] = true;
+
+							tSG->add( eeNew( SubTexture, ( TextureFactory::instance()->loadFromFile( fpath ), name ) ) );
+						}
 					}
 				}
 			}
@@ -161,8 +223,8 @@ UITheme * UITheme::loadFromFile( UITheme * tTheme, const std::string& Path ) {
 	return tTheme;
 }
 
-UITheme * UITheme::loadFromFile( const std::string& Path, const std::string& Name, const std::string& NameAbbr ) {
-	return loadFromFile( UITheme::New( Name, NameAbbr ), Path );
+UITheme * UITheme::loadFromFile( const std::string& Path, const std::string& Name, const std::string& NameAbbr, const Float& pixelDensity ) {
+	return loadFromFile( UITheme::New( Name, NameAbbr ), Path, pixelDensity );
 }
 
 UITheme * UITheme::loadFromTextureAtlas( Graphics::TextureAtlas * TextureAtlas, const std::string& Name, const std::string NameAbbr ) {
diff --git a/src/eepp/window/engine.cpp b/src/eepp/window/engine.cpp
index 16cc91013..f9860e1df 100755
--- a/src/eepp/window/engine.cpp
+++ b/src/eepp/window/engine.cpp
@@ -6,6 +6,7 @@
 #include <eepp/graphics/globalbatchrenderer.hpp>
 #include <eepp/graphics/shaderprogrammanager.hpp>
 #include <eepp/graphics/textureatlasmanager.hpp>
+#include <eepp/graphics/ninepatchmanager.hpp>
 #include <eepp/graphics/framebuffermanager.hpp>
 #include <eepp/graphics/vertexbuffermanager.hpp>
 #include <eepp/ui/uimanager.hpp>
@@ -50,6 +51,8 @@ Engine::~Engine() {
 
 	TextureAtlasManager::destroySingleton();
 
+	NinePatchManager::destroySingleton();
+
 	FontManager::destroySingleton();
 
 	TextureFactory::destroySingleton();
diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp
index e16dece01..c7b4ddd68 100644
--- a/src/test/eetest.cpp
+++ b/src/test/eetest.cpp
@@ -170,7 +170,11 @@ void EETest::createUIThemeTextureAtlas() {
 	std::string Path( MyPath + "ui/" + mThemeName );
 
 	if ( !FileSystem::fileExists( tgpath + EE_TEXTURE_ATLAS_EXTENSION ) ) {
-		TexturePacker tp( 512, 512, mThemeName.find_first_of( "2x" ) != std::string::npos ? PD_XHDPI : ( mThemeName.find_first_of( "1.5x" ) != std::string::npos ? PD_HDPI : PD_MDPI ), true, 2 );
+		EE_PIXEL_DENSITY PD = PD_MDPI;
+		if ( mThemeName.find( "2x" ) != std::string::npos ) PD = PD_XHDPI;
+		else if  ( mThemeName.find( "1.5x" ) != std::string::npos ) PD = PD_HDPI;
+
+		TexturePacker tp( 2048, 2048, PD, true, 2 );
 		tp.addTexturesPath( Path );
 		tp.packTextures();
 		tp.save( tgpath + ".png", SAVE_TYPE_PNG );
@@ -279,8 +283,10 @@ void EETest::createUI() {
 
 	mThemeName = "uitheme";
 
-	if ( PixelDensity::getPixelDensity() >= 1.1 ) {
-		mThemeName += "2x";
+	if ( PixelDensity::getPixelDensity() > 1.5 ) {
+		mThemeName = "uitheme2x";
+	} else if ( PixelDensity::getPixelDensity() >= 1.1 ) {
+		mThemeName = "uitheme1.5x";
 	}
 
 	createUIThemeTextureAtlas();
@@ -296,7 +302,6 @@ void EETest::createUI() {
 	//mTheme = UITheme::loadFromFile( UIThemeDefault::New( mThemeName, mThemeName ), MyPath + "ui/" + mThemeName + "/" );
 
 	TextureAtlasLoader tgl( MyPath + "ui/" + mThemeName + EE_TEXTURE_ATLAS_EXTENSION );
-
 	mTheme = UITheme::loadFromTextureAtlas( UIThemeDefault::New( mThemeName, mThemeName ), TextureAtlasManager::instance()->getByName( mThemeName ) );
 
 	UIThemeManager::instance()->add( mTheme );
@@ -482,7 +487,7 @@ void EETest::createUI() {
 
 	C = reinterpret_cast<UIControlAnim*> ( C->getParent() );
 
-	createNewUI();
+	//createNewUI();
 
 #ifdef EE_PLATFORM_TOUCH
 	TextureAtlas * SG = GlobalTextureAtlas::instance();