diff --git a/bin/assets/ui/uitheme.eta b/bin/assets/ui/uitheme.eta
index d81598a53..c2a26ba72 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 236863c65..e9c29cc55 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_menter.4_3_4_3.9.png b/bin/assets/ui/uitheme/uitheme_button_hover.4_3_4_3.9.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_button_menter.4_3_4_3.9.png
rename to bin/assets/ui/uitheme/uitheme_button_hover.4_3_4_3.9.png
diff --git a/bin/assets/ui/uitheme/uitheme_button_mdown.4_3_4_3.9.png b/bin/assets/ui/uitheme/uitheme_button_pressed.4_3_4_3.9.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_button_mdown.4_3_4_3.9.png
rename to bin/assets/ui/uitheme/uitheme_button_pressed.4_3_4_3.9.png
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_hover.0_10_0_10.9.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_combobox_button_menter.0_10_0_10.9.png
rename to bin/assets/ui/uitheme/uitheme_combobox_button_hover.0_10_0_10.9.png
diff --git a/bin/assets/ui/uitheme/uitheme_dropdownlist_menter.3_11_25_11.9.png b/bin/assets/ui/uitheme/uitheme_dropdownlist_hover.3_11_25_11.9.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_dropdownlist_menter.3_11_25_11.9.png
rename to bin/assets/ui/uitheme/uitheme_dropdownlist_hover.3_11_25_11.9.png
diff --git a/bin/assets/ui/uitheme/uitheme_gridcell_menter.png b/bin/assets/ui/uitheme/uitheme_gridcell_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_gridcell_menter.png
rename to bin/assets/ui/uitheme/uitheme_gridcell_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_btndown_menter.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_hscrollbar_btndown_menter.png
rename to bin/assets/ui/uitheme/uitheme_hscrollbar_btndown_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_hscrollbar_btnup_menter.png b/bin/assets/ui/uitheme/uitheme_hscrollbar_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_hscrollbar_btnup_menter.png
rename to bin/assets/ui/uitheme/uitheme_hscrollbar_btnup_hover.png
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_hover.5_0_5_0.9.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_hscrollbar_button_menter.5_0_5_0.9.png
rename to bin/assets/ui/uitheme/uitheme_hscrollbar_button_hover.5_0_5_0.9.png
diff --git a/bin/assets/ui/uitheme/uitheme_hslider_button_menter.png b/bin/assets/ui/uitheme/uitheme_hslider_button_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_hslider_button_menter.png
rename to bin/assets/ui/uitheme/uitheme_hslider_button_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_listboxitem_menter.png b/bin/assets/ui/uitheme/uitheme_listboxitem_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_listboxitem_menter.png
rename to bin/assets/ui/uitheme/uitheme_listboxitem_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_menuarrow_menter.png b/bin/assets/ui/uitheme/uitheme_menuarrow_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_menuarrow_menter.png
rename to bin/assets/ui/uitheme/uitheme_menuarrow_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_menucheckbox_active_menter.png b/bin/assets/ui/uitheme/uitheme_menucheckbox_active_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_menucheckbox_active_menter.png
rename to bin/assets/ui/uitheme/uitheme_menucheckbox_active_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_btndown_menter.png b/bin/assets/ui/uitheme/uitheme_spinbox_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_spinbox_btndown_menter.png
rename to bin/assets/ui/uitheme/uitheme_spinbox_btndown_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_btndown_mdown.png b/bin/assets/ui/uitheme/uitheme_spinbox_btndown_pressed.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_spinbox_btndown_mdown.png
rename to bin/assets/ui/uitheme/uitheme_spinbox_btndown_pressed.png
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_btnup_menter.png b/bin/assets/ui/uitheme/uitheme_spinbox_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_spinbox_btnup_menter.png
rename to bin/assets/ui/uitheme/uitheme_spinbox_btnup_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_spinbox_btnup_mdown.png b/bin/assets/ui/uitheme/uitheme_spinbox_btnup_pressed.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_spinbox_btnup_mdown.png
rename to bin/assets/ui/uitheme/uitheme_spinbox_btnup_pressed.png
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_btndown_menter.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_vscrollbar_btndown_menter.png
rename to bin/assets/ui/uitheme/uitheme_vscrollbar_btndown_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_vscrollbar_btnup_menter.png b/bin/assets/ui/uitheme/uitheme_vscrollbar_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_vscrollbar_btnup_menter.png
rename to bin/assets/ui/uitheme/uitheme_vscrollbar_btnup_hover.png
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_hover.0_5_0_5.9.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_vscrollbar_button_menter.0_5_0_5.9.png
rename to bin/assets/ui/uitheme/uitheme_vscrollbar_button_hover.0_5_0_5.9.png
diff --git a/bin/assets/ui/uitheme/uitheme_vslider_button_menter.png b/bin/assets/ui/uitheme/uitheme_vslider_button_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_vslider_button_menter.png
rename to bin/assets/ui/uitheme/uitheme_vslider_button_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_winclose_menter.png b/bin/assets/ui/uitheme/uitheme_winclose_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_winclose_menter.png
rename to bin/assets/ui/uitheme/uitheme_winclose_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_winmax_menter.png b/bin/assets/ui/uitheme/uitheme_winmax_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_winmax_menter.png
rename to bin/assets/ui/uitheme/uitheme_winmax_hover.png
diff --git a/bin/assets/ui/uitheme/uitheme_winmin_menter.png b/bin/assets/ui/uitheme/uitheme_winmin_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme/uitheme_winmin_menter.png
rename to bin/assets/ui/uitheme/uitheme_winmin_hover.png
diff --git a/bin/assets/ui/uitheme1.5x.eta b/bin/assets/ui/uitheme1.5x.eta
index 6b9f0bcff..c00be391d 100644
Binary files a/bin/assets/ui/uitheme1.5x.eta 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
index f868ccf95..aeb77ff2a 100644
Binary files a/bin/assets/ui/uitheme1.5x.png and b/bin/assets/ui/uitheme1.5x.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_hover.6_4_6_4.9.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_button_menter.6_4_6_4.9.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_button_hover.6_4_6_4.9.png
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_pressed.6_4_6_4.9.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_button_mdown.6_4_6_4.9.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_button_pressed.6_4_6_4.9.png
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_hover.0_15_0_15.9.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_button_menter.0_15_0_15.9.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_combobox_button_hover.0_15_0_15.9.png
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_hover.4_16_37_16.9.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_dropdownlist_menter.4_16_37_16.9.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_dropdownlist_hover.4_16_37_16.9.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_gridcell_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btndown_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_btnup_hover.png
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_hover.7_0_7_0.9.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_button_menter.7_0_7_0.9.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_hscrollbar_button_hover.7_0_7_0.9.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_hslider_button_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_listboxitem_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_menuarrow_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_menucheckbox_active_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_mdown.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_pressed.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_mdown.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btndown_pressed.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_mdown.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_pressed.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_mdown.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_spinbox_btnup_pressed.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btndown_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_btnup_hover.png
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_hover.0_7_0_7.9.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_button_menter.0_7_0_7.9.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_vscrollbar_button_hover.0_7_0_7.9.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_vslider_button_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_winclose_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_winmax_hover.png
diff --git a/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_menter.png b/bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_menter.png
rename to bin/assets/ui/uitheme1.5x/uitheme1.5x_winmin_hover.png
diff --git a/bin/assets/ui/uitheme2x.eta b/bin/assets/ui/uitheme2x.eta
index 434483c62..10c436d66 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 78c0713f1..72756b2a1 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_menter.8_6_8_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_button_hover.8_6_8_6.9.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_button_menter.8_6_8_6.9.png
rename to bin/assets/ui/uitheme2x/uitheme2x_button_hover.8_6_8_6.9.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_button_mdown.8_6_8_6.9.png b/bin/assets/ui/uitheme2x/uitheme2x_button_pressed.8_6_8_6.9.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_button_mdown.8_6_8_6.9.png
rename to bin/assets/ui/uitheme2x/uitheme2x_button_pressed.8_6_8_6.9.png
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_hover.0_20_0_20.9.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_combobox_button_menter.0_20_0_20.9.png
rename to bin/assets/ui/uitheme2x/uitheme2x_combobox_button_hover.0_20_0_20.9.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter.6_22_50_22.9.png b/bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_hover.6_22_50_22.9.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_menter.6_22_50_22.9.png
rename to bin/assets/ui/uitheme2x/uitheme2x_dropdownlist_hover.6_22_50_22.9.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_gridcell_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_gridcell_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_gridcell_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_gridcell_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_btndown_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_btndown_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_btndown_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_btnup_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_btnup_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_btnup_hover.png
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_hover.10_0_10_0.9.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_menter.10_0_10_0.9.png
rename to bin/assets/ui/uitheme2x/uitheme2x_hscrollbar_button_hover.10_0_10_0.9.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_hslider_button_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_hslider_button_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_hslider_button_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_hslider_button_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_listboxitem_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_listboxitem_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_listboxitem_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_listboxitem_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menuarrow_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_menuarrow_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_menuarrow_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_menuarrow_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_menucheckbox_active_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_menucheckbox_active_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_menucheckbox_active_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_menucheckbox_active_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_btndown_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_spinbox_btndown_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_spinbox_btndown_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_btndown_mdown.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_btndown_pressed.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_spinbox_btndown_mdown.png
rename to bin/assets/ui/uitheme2x/uitheme2x_spinbox_btndown_pressed.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_btnup_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_spinbox_btnup_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_spinbox_btnup_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_spinbox_btnup_mdown.png b/bin/assets/ui/uitheme2x/uitheme2x_spinbox_btnup_pressed.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_spinbox_btnup_mdown.png
rename to bin/assets/ui/uitheme2x/uitheme2x_spinbox_btnup_pressed.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_btndown_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_btndown_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_btndown_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_btndown_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_btnup_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_btnup_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_btnup_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_btnup_hover.png
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_hover.0_10_0_10.9.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_menter.0_10_0_10.9.png
rename to bin/assets/ui/uitheme2x/uitheme2x_vscrollbar_button_hover.0_10_0_10.9.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_vslider_button_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_vslider_button_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_vslider_button_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_vslider_button_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_winclose_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_winclose_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_winclose_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_winclose_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_winmax_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_winmax_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_winmax_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_winmax_hover.png
diff --git a/bin/assets/ui/uitheme2x/uitheme2x_winmin_menter.png b/bin/assets/ui/uitheme2x/uitheme2x_winmin_hover.png
similarity index 100%
rename from bin/assets/ui/uitheme2x/uitheme2x_winmin_menter.png
rename to bin/assets/ui/uitheme2x/uitheme2x_winmin_hover.png
diff --git a/include/eepp/ui/uiskinstate.hpp b/include/eepp/ui/uiskinstate.hpp
index 227520af8..e70548c34 100644
--- a/include/eepp/ui/uiskinstate.hpp
+++ b/include/eepp/ui/uiskinstate.hpp
@@ -15,7 +15,8 @@ class EE_API UISkinState {
 			StateSelected	= 2,
 			StateHover		= 3,
 			StatePressed	= 4,
-			StateCount		= 5
+			StateDisabled	= 5,
+			StateCount		= 6
 		};
 
 		static UISkinState * New( UISkin * skin );
diff --git a/src/eepp/ui/uiskin.cpp b/src/eepp/ui/uiskin.cpp
index e9e81d223..830a5b109 100644
--- a/src/eepp/ui/uiskin.cpp
+++ b/src/eepp/ui/uiskin.cpp
@@ -7,8 +7,9 @@ const char * UISkinStatesNames[] = {
 	"normal",
 	"focus",
 	"selected",
-	"menter",
-	"mdown"
+	"hover",
+	"pressed",
+	"disabled"
 };
 
 const char * UISkin::getSkinStateName( const Uint32& State ) {