diff --git a/legacy/elementary/data/themes/Makefile.am b/legacy/elementary/data/themes/Makefile.am
index b8bfddbfd1..fd1b080cbb 100644
--- a/legacy/elementary/data/themes/Makefile.am
+++ b/legacy/elementary/data/themes/Makefile.am
@@ -5,7 +5,7 @@ EDJE_CC = @edje_cc@
 EDJE_FLAGS_VERBOSE_ =
 EDJE_FLAGS_VERBOSE_0 =
 EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/themes -fd $(top_srcdir)/data/themes
+EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/themes/images -fd $(top_srcdir)/data/themes
 
 filesdir = $(datadir)/elementary/themes
 files_DATA = default.edj default-desktop.edj
@@ -65,274 +65,274 @@ widgets/datetime.edc \
 widgets/dayselector.edc \
 widgets/popup.edc \
 ews.edc \
-arrow_down.png \
-arrow_up.png \
-bar_shine.png \
-bd_bottom.png \
-bd_button_close_focused.png \
-bd_button_close_shadow.png \
-bd_button_close_unfocused.png \
-bd_button_max_focused.png \
-bd_button_max_shadow.png \
-bd_button_max_unfocused.png \
-bd_button_min_focused.png \
-bd_button_min_shadow.png \
-bd_button_min_unfocused.png \
-bd_resize_b.png \
-bd_title_bg.png \
-bd_title_over.png \
-bd_top_hilight.png \
-bd_top.png \
-bt_base1.png \
-bt_base2.png \
-bt_bases.png \
-bt_basew.png \
-bt_glow.png \
-bt_hilight.png \
-bt_hilightw.png \
-bt_shine.png \
-bt_sm_base1.png \
-bt_sm_base2.png \
-bt_sm_hilight.png \
-bt_sm_shine.png \
-bt_dis_base.png \
-bt_dis_hilight.png \
-ctxpopup_arrow_left.png \
-ctxpopup_arrow_down.png \
-ctxpopup_arrow_right.png \
-ctxpopup_arrow_up.png \
-dia_botshad.png \
-dia_grad.png \
-dia_topshad.png \
-exclam.png \
-frame_1.png \
-frame_2.png \
-flip_0b.png \
-flip_0t.png \
-flip_1b.png \
-flip_1t.png \
-flip_2b.png \
-flip_2t.png \
-flip_3b.png \
-flip_3t.png \
-flip_4b.png \
-flip_4t.png \
-flip_5b.png \
-flip_5t.png \
-flip_6b.png \
-flip_6t.png \
-flip_7b.png \
-flip_7t.png \
-flip_8b.png \
-flip_8t.png \
-flip_9b.png \
-flip_9t.png \
-flip_amb.png \
-flip_amt.png \
-flip_base.png \
-flip_base_shad.png \
-flip_pmb.png \
-flip_pmt.png \
-flip_shad.png \
-flip_t.png \
-flip_b.png \
-head.png \
-sb_runnerh.png \
-sb_runnerv.png \
-seg_single_pressed.png \
-seg_single_selected.png \
-seg_single_normal.png \
-seg_left_pressed.png \
-seg_left_selected.png \
-seg_left_normal.png \
-seg_middle_pressed.png \
-seg_middle_selected.png \
-seg_middle_normal.png \
-seg_right_pressed.png \
-seg_right_selected.png \
-seg_right_normal.png \
-shelf_inset.png \
-tog_base_on.png \
-tog_base_off.png \
-tog_dis_base_on.png \
-tog_dis_base_off.png \
-shad_circ.png \
-bt_dis_base.png \
-bt_dis_hilight.png \
-outdent-top.png \
-outdent-bottom.png \
-updown.png \
-leftright.png \
-hoversel_entry_bg.png \
-cur_box.png \
-cur_hi.png \
-cur_shad.png \
-cur_shine.png \
-cur_glow.png \
-bubble.png \
-bubble_3.png \
-bubble_shine3.png \
-bubble_4.png \
-bubble_shine4.png \
-bubble_1.png \
-bubble_shine.png \
-bubble_2.png \
-icon_home.png \
-icon_close.png \
-icon_apps.png \
-icon_arrow_up.png \
-icon_arrow_down.png \
-icon_arrow_left.png \
-icon_arrow_right.png \
-bt_dis_shine.png \
-icon_left_arrow.png \
-icon_right_arrow.png \
-toolbar_sel.png \
-icon_chat.png \
-icon_clock.png \
-icon_delete.png \
-icon_edit.png \
-icon_refresh.png \
-icon_folder.png \
-icon_file.png \
-ilist_1.png \
-ilist_1_h.png \
-ilist_2.png \
-ilist_2_h.png \
-ilist_item_shadow.png \
-ilist_item_shadow_h.png \
-sl_bg.png \
-sl_bg_over.png \
-sl_bt_0.png \
-sl_bt_1.png \
-sl_bt_2.png \
-sl_bt_3.png \
-sl_bt2_0_0.png \
-sl_bt2_0_1.png \
-sl_bt2_0_2.png \
-sl_bt2_1.png \
-sl_bt2_2.png \
-sl_units.png \
-slv_bg.png \
-slv_bg_over.png \
-slv_units.png \
-check_base.png \
-check.png \
-check2.png \
-radio_base.png \
-radio.png \
-radio2.png \
-separator_h.png \
-separator_v.png \
-toolbar_separator_h.png \
-toolbar_separator_v.png \
-sp_bt_l.png \
-sp_bt_r.png \
-busy-1.png \
-busy-2.png \
-busy-3.png \
-busy-4.png \
-busy-5.png \
-busy-6.png \
-busy-7.png \
-busy-8.png \
-busy-9.png \
-arrow_right.png \
-arrow_left.png \
-bt_spinner_up.png \
-bt_spinner_down.png \
-bt_spinner_hilight.png \
-up.png \
-down.png \
-emo-angry.png \
-emo-angry-shout.png \
-emo-crazy-laugh.png \
-emo-evil-laugh.png \
-emo-evil.png \
-emo-goggle-smile.png \
-emo-grumpy.png \
-emo-grumpy-smile.png \
-emo-guilty.png \
-emo-guilty-smile.png \
-emo-haha.png \
-emo-half-smile.png \
-emo-happy-panting.png \
-emo-happy.png \
-emo-indifferent.png \
-emo-kiss.png \
-emo-knowing-grin.png \
-emo-laugh.png \
-emo-little-bit-sorry.png \
-emo-love-lots.png \
-emo-love.png \
-emo-minimal-smile.png \
-emo-not-happy.png \
-emo-not-impressed.png \
-emo-omg.png \
-emo-opensmile.png \
-emo-smile.png \
-emo-sorry.png \
-emo-squint-laugh.png \
-emo-surprised.png \
-emo-suspicious.png \
-emo-tongue-dangling.png \
-emo-tongue-poke.png \
-emo-uh.png \
-emo-unhappy.png \
-emo-very-sorry.png \
-emo-what.png \
-emo-wink.png \
-emo-worried.png \
-emo-wtf.png \
-map_item.png \
-shadow.png \
-black.png \
-tooltip-corner-top-left-tip.png \
-tooltip-base.png \
-tooltip-corner-bottom-left-tip.png \
-tooltip-edge-top-tip.png \
-tooltip-corner-bottom-right-tip.png \
-tooltip-edge-left-tip.png \
-tooltip-edge-bottom-tip.png \
-tooltip-edge-right-tip.png \
-tooltip-corner-top-right-tip.png \
-color_picker_alpha.png \
-color_picker_alpha_bg.png \
-color_picker_brightness.png \
-color_picker_color.png \
-color_picker_opacity.png \
-icon_arrow_down_left.png \
-icon_arrow_down_right.png \
-icon_arrow_up_left.png \
-icon_arrow_up_right.png \
-thumb_shadow.png \
-group_index.png \
-mp_forward.png \
-mp_info.png \
-mp_next.png \
-mp_pause.png \
-mp_play.png \
-mp_prev.png \
-mp_rewind.png \
-mp_stop.png \
-access_glow.png \
-pointer_glint_01.png \
-pointer_glint_02.png \
-pointer_glint_03.png \
-pointer_glint_04.png \
-pointer_glint_05.png \
-pointer_glint_06.png \
-pointer_glint_07.png \
-pointer_glint_08.png \
-pointer_glint_09.png \
-pointer_glint_10.png \
-pointer_glint_11.png \
-pointer_glint_12.png \
-pointer_glow.png \
-pointer.png \
-map_circle.png \
-map_scale.png \
-naviframe-base.jpg
+images/arrow_down.png \
+images/arrow_up.png \
+images/bar_shine.png \
+images/bd_bottom.png \
+images/bd_button_close_focused.png \
+images/bd_button_close_shadow.png \
+images/bd_button_close_unfocused.png \
+images/bd_button_max_focused.png \
+images/bd_button_max_shadow.png \
+images/bd_button_max_unfocused.png \
+images/bd_button_min_focused.png \
+images/bd_button_min_shadow.png \
+images/bd_button_min_unfocused.png \
+images/bd_resize_b.png \
+images/bd_title_bg.png \
+images/bd_title_over.png \
+images/bd_top_hilight.png \
+images/bd_top.png \
+images/bt_base1.png \
+images/bt_base2.png \
+images/bt_bases.png \
+images/bt_basew.png \
+images/bt_glow.png \
+images/bt_hilight.png \
+images/bt_hilightw.png \
+images/bt_shine.png \
+images/bt_sm_base1.png \
+images/bt_sm_base2.png \
+images/bt_sm_hilight.png \
+images/bt_sm_shine.png \
+images/bt_dis_base.png \
+images/bt_dis_hilight.png \
+images/ctxpopup_arrow_left.png \
+images/ctxpopup_arrow_down.png \
+images/ctxpopup_arrow_right.png \
+images/ctxpopup_arrow_up.png \
+images/dia_botshad.png \
+images/dia_grad.png \
+images/dia_topshad.png \
+images/exclam.png \
+images/frame_1.png \
+images/frame_2.png \
+images/flip_0b.png \
+images/flip_0t.png \
+images/flip_1b.png \
+images/flip_1t.png \
+images/flip_2b.png \
+images/flip_2t.png \
+images/flip_3b.png \
+images/flip_3t.png \
+images/flip_4b.png \
+images/flip_4t.png \
+images/flip_5b.png \
+images/flip_5t.png \
+images/flip_6b.png \
+images/flip_6t.png \
+images/flip_7b.png \
+images/flip_7t.png \
+images/flip_8b.png \
+images/flip_8t.png \
+images/flip_9b.png \
+images/flip_9t.png \
+images/flip_amb.png \
+images/flip_amt.png \
+images/flip_base.png \
+images/flip_base_shad.png \
+images/flip_pmb.png \
+images/flip_pmt.png \
+images/flip_shad.png \
+images/flip_t.png \
+images/flip_b.png \
+images/head.png \
+images/sb_runnerh.png \
+images/sb_runnerv.png \
+images/seg_single_pressed.png \
+images/seg_single_selected.png \
+images/seg_single_normal.png \
+images/seg_left_pressed.png \
+images/seg_left_selected.png \
+images/seg_left_normal.png \
+images/seg_middle_pressed.png \
+images/seg_middle_selected.png \
+images/seg_middle_normal.png \
+images/seg_right_pressed.png \
+images/seg_right_selected.png \
+images/seg_right_normal.png \
+images/shelf_inset.png \
+images/tog_base_on.png \
+images/tog_base_off.png \
+images/tog_dis_base_on.png \
+images/tog_dis_base_off.png \
+images/shad_circ.png \
+images/bt_dis_base.png \
+images/bt_dis_hilight.png \
+images/outdent-top.png \
+images/outdent-bottom.png \
+images/updown.png \
+images/leftright.png \
+images/hoversel_entry_bg.png \
+images/cur_box.png \
+images/cur_hi.png \
+images/cur_shad.png \
+images/cur_shine.png \
+images/cur_glow.png \
+images/bubble.png \
+images/bubble_3.png \
+images/bubble_shine3.png \
+images/bubble_4.png \
+images/bubble_shine4.png \
+images/bubble_1.png \
+images/bubble_shine.png \
+images/bubble_2.png \
+images/icon_home.png \
+images/icon_close.png \
+images/icon_apps.png \
+images/icon_arrow_up.png \
+images/icon_arrow_down.png \
+images/icon_arrow_left.png \
+images/icon_arrow_right.png \
+images/bt_dis_shine.png \
+images/icon_left_arrow.png \
+images/icon_right_arrow.png \
+images/toolbar_sel.png \
+images/icon_chat.png \
+images/icon_clock.png \
+images/icon_delete.png \
+images/icon_edit.png \
+images/icon_refresh.png \
+images/icon_folder.png \
+images/icon_file.png \
+images/ilist_1.png \
+images/ilist_1_h.png \
+images/ilist_2.png \
+images/ilist_2_h.png \
+images/ilist_item_shadow.png \
+images/ilist_item_shadow_h.png \
+images/sl_bg.png \
+images/sl_bg_over.png \
+images/sl_bt_0.png \
+images/sl_bt_1.png \
+images/sl_bt_2.png \
+images/sl_bt_3.png \
+images/sl_bt2_0_0.png \
+images/sl_bt2_0_1.png \
+images/sl_bt2_0_2.png \
+images/sl_bt2_1.png \
+images/sl_bt2_2.png \
+images/sl_units.png \
+images/slv_bg.png \
+images/slv_bg_over.png \
+images/slv_units.png \
+images/check_base.png \
+images/check.png \
+images/check2.png \
+images/radio_base.png \
+images/radio.png \
+images/radio2.png \
+images/separator_h.png \
+images/separator_v.png \
+images/toolbar_separator_h.png \
+images/toolbar_separator_v.png \
+images/sp_bt_l.png \
+images/sp_bt_r.png \
+images/busy-1.png \
+images/busy-2.png \
+images/busy-3.png \
+images/busy-4.png \
+images/busy-5.png \
+images/busy-6.png \
+images/busy-7.png \
+images/busy-8.png \
+images/busy-9.png \
+images/arrow_right.png \
+images/arrow_left.png \
+images/bt_spinner_up.png \
+images/bt_spinner_down.png \
+images/bt_spinner_hilight.png \
+images/up.png \
+images/down.png \
+images/emo-angry.png \
+images/emo-angry-shout.png \
+images/emo-crazy-laugh.png \
+images/emo-evil-laugh.png \
+images/emo-evil.png \
+images/emo-goggle-smile.png \
+images/emo-grumpy.png \
+images/emo-grumpy-smile.png \
+images/emo-guilty.png \
+images/emo-guilty-smile.png \
+images/emo-haha.png \
+images/emo-half-smile.png \
+images/emo-happy-panting.png \
+images/emo-happy.png \
+images/emo-indifferent.png \
+images/emo-kiss.png \
+images/emo-knowing-grin.png \
+images/emo-laugh.png \
+images/emo-little-bit-sorry.png \
+images/emo-love-lots.png \
+images/emo-love.png \
+images/emo-minimal-smile.png \
+images/emo-not-happy.png \
+images/emo-not-impressed.png \
+images/emo-omg.png \
+images/emo-opensmile.png \
+images/emo-smile.png \
+images/emo-sorry.png \
+images/emo-squint-laugh.png \
+images/emo-surprised.png \
+images/emo-suspicious.png \
+images/emo-tongue-dangling.png \
+images/emo-tongue-poke.png \
+images/emo-uh.png \
+images/emo-unhappy.png \
+images/emo-very-sorry.png \
+images/emo-what.png \
+images/emo-wink.png \
+images/emo-worried.png \
+images/emo-wtf.png \
+images/map_item.png \
+images/shadow.png \
+images/black.png \
+images/tooltip-corner-top-left-tip.png \
+images/tooltip-base.png \
+images/tooltip-corner-bottom-left-tip.png \
+images/tooltip-edge-top-tip.png \
+images/tooltip-corner-bottom-right-tip.png \
+images/tooltip-edge-left-tip.png \
+images/tooltip-edge-bottom-tip.png \
+images/tooltip-edge-right-tip.png \
+images/tooltip-corner-top-right-tip.png \
+images/color_picker_alpha.png \
+images/color_picker_alpha_bg.png \
+images/color_picker_brightness.png \
+images/color_picker_color.png \
+images/color_picker_opacity.png \
+images/icon_arrow_down_left.png \
+images/icon_arrow_down_right.png \
+images/icon_arrow_up_left.png \
+images/icon_arrow_up_right.png \
+images/thumb_shadow.png \
+images/group_index.png \
+images/mp_forward.png \
+images/mp_info.png \
+images/mp_next.png \
+images/mp_pause.png \
+images/mp_play.png \
+images/mp_prev.png \
+images/mp_rewind.png \
+images/mp_stop.png \
+images/access_glow.png \
+images/pointer_glint_01.png \
+images/pointer_glint_02.png \
+images/pointer_glint_03.png \
+images/pointer_glint_04.png \
+images/pointer_glint_05.png \
+images/pointer_glint_06.png \
+images/pointer_glint_07.png \
+images/pointer_glint_08.png \
+images/pointer_glint_09.png \
+images/pointer_glint_10.png \
+images/pointer_glint_11.png \
+images/pointer_glint_12.png \
+images/pointer_glow.png \
+images/pointer.png \
+images/map_circle.png \
+images/map_scale.png \
+images/naviframe-base.jpg
 
 default.edj: Makefile $(EXTRA_DIST)
 	$(EDJE_CC) $(EDJE_FLAGS) \
diff --git a/legacy/elementary/data/themes/access_glow.png b/legacy/elementary/data/themes/images/access_glow.png
similarity index 100%
rename from legacy/elementary/data/themes/access_glow.png
rename to legacy/elementary/data/themes/images/access_glow.png
diff --git a/legacy/elementary/data/themes/arrow_down.png b/legacy/elementary/data/themes/images/arrow_down.png
similarity index 100%
rename from legacy/elementary/data/themes/arrow_down.png
rename to legacy/elementary/data/themes/images/arrow_down.png
diff --git a/legacy/elementary/data/themes/arrow_left.png b/legacy/elementary/data/themes/images/arrow_left.png
similarity index 100%
rename from legacy/elementary/data/themes/arrow_left.png
rename to legacy/elementary/data/themes/images/arrow_left.png
diff --git a/legacy/elementary/data/themes/arrow_right.png b/legacy/elementary/data/themes/images/arrow_right.png
similarity index 100%
rename from legacy/elementary/data/themes/arrow_right.png
rename to legacy/elementary/data/themes/images/arrow_right.png
diff --git a/legacy/elementary/data/themes/arrow_up.png b/legacy/elementary/data/themes/images/arrow_up.png
similarity index 100%
rename from legacy/elementary/data/themes/arrow_up.png
rename to legacy/elementary/data/themes/images/arrow_up.png
diff --git a/legacy/elementary/data/themes/bar_shine.png b/legacy/elementary/data/themes/images/bar_shine.png
similarity index 100%
rename from legacy/elementary/data/themes/bar_shine.png
rename to legacy/elementary/data/themes/images/bar_shine.png
diff --git a/legacy/elementary/data/themes/bd_bottom.png b/legacy/elementary/data/themes/images/bd_bottom.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_bottom.png
rename to legacy/elementary/data/themes/images/bd_bottom.png
diff --git a/legacy/elementary/data/themes/bd_button_close_focused.png b/legacy/elementary/data/themes/images/bd_button_close_focused.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_close_focused.png
rename to legacy/elementary/data/themes/images/bd_button_close_focused.png
diff --git a/legacy/elementary/data/themes/bd_button_close_shadow.png b/legacy/elementary/data/themes/images/bd_button_close_shadow.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_close_shadow.png
rename to legacy/elementary/data/themes/images/bd_button_close_shadow.png
diff --git a/legacy/elementary/data/themes/bd_button_close_unfocused.png b/legacy/elementary/data/themes/images/bd_button_close_unfocused.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_close_unfocused.png
rename to legacy/elementary/data/themes/images/bd_button_close_unfocused.png
diff --git a/legacy/elementary/data/themes/bd_button_max_focused.png b/legacy/elementary/data/themes/images/bd_button_max_focused.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_max_focused.png
rename to legacy/elementary/data/themes/images/bd_button_max_focused.png
diff --git a/legacy/elementary/data/themes/bd_button_max_shadow.png b/legacy/elementary/data/themes/images/bd_button_max_shadow.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_max_shadow.png
rename to legacy/elementary/data/themes/images/bd_button_max_shadow.png
diff --git a/legacy/elementary/data/themes/bd_button_max_unfocused.png b/legacy/elementary/data/themes/images/bd_button_max_unfocused.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_max_unfocused.png
rename to legacy/elementary/data/themes/images/bd_button_max_unfocused.png
diff --git a/legacy/elementary/data/themes/bd_button_min_focused.png b/legacy/elementary/data/themes/images/bd_button_min_focused.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_min_focused.png
rename to legacy/elementary/data/themes/images/bd_button_min_focused.png
diff --git a/legacy/elementary/data/themes/bd_button_min_shadow.png b/legacy/elementary/data/themes/images/bd_button_min_shadow.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_min_shadow.png
rename to legacy/elementary/data/themes/images/bd_button_min_shadow.png
diff --git a/legacy/elementary/data/themes/bd_button_min_unfocused.png b/legacy/elementary/data/themes/images/bd_button_min_unfocused.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_button_min_unfocused.png
rename to legacy/elementary/data/themes/images/bd_button_min_unfocused.png
diff --git a/legacy/elementary/data/themes/bd_resize_b.png b/legacy/elementary/data/themes/images/bd_resize_b.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_resize_b.png
rename to legacy/elementary/data/themes/images/bd_resize_b.png
diff --git a/legacy/elementary/data/themes/bd_title_bg.png b/legacy/elementary/data/themes/images/bd_title_bg.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_title_bg.png
rename to legacy/elementary/data/themes/images/bd_title_bg.png
diff --git a/legacy/elementary/data/themes/bd_title_over.png b/legacy/elementary/data/themes/images/bd_title_over.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_title_over.png
rename to legacy/elementary/data/themes/images/bd_title_over.png
diff --git a/legacy/elementary/data/themes/bd_top.png b/legacy/elementary/data/themes/images/bd_top.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_top.png
rename to legacy/elementary/data/themes/images/bd_top.png
diff --git a/legacy/elementary/data/themes/bd_top_hilight.png b/legacy/elementary/data/themes/images/bd_top_hilight.png
similarity index 100%
rename from legacy/elementary/data/themes/bd_top_hilight.png
rename to legacy/elementary/data/themes/images/bd_top_hilight.png
diff --git a/legacy/elementary/data/themes/black.png b/legacy/elementary/data/themes/images/black.png
similarity index 100%
rename from legacy/elementary/data/themes/black.png
rename to legacy/elementary/data/themes/images/black.png
diff --git a/legacy/elementary/data/themes/bt_base1.png b/legacy/elementary/data/themes/images/bt_base1.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_base1.png
rename to legacy/elementary/data/themes/images/bt_base1.png
diff --git a/legacy/elementary/data/themes/bt_base2.png b/legacy/elementary/data/themes/images/bt_base2.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_base2.png
rename to legacy/elementary/data/themes/images/bt_base2.png
diff --git a/legacy/elementary/data/themes/bt_bases.png b/legacy/elementary/data/themes/images/bt_bases.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_bases.png
rename to legacy/elementary/data/themes/images/bt_bases.png
diff --git a/legacy/elementary/data/themes/bt_basew.png b/legacy/elementary/data/themes/images/bt_basew.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_basew.png
rename to legacy/elementary/data/themes/images/bt_basew.png
diff --git a/legacy/elementary/data/themes/bt_dis_base.png b/legacy/elementary/data/themes/images/bt_dis_base.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_dis_base.png
rename to legacy/elementary/data/themes/images/bt_dis_base.png
diff --git a/legacy/elementary/data/themes/bt_dis_hilight.png b/legacy/elementary/data/themes/images/bt_dis_hilight.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_dis_hilight.png
rename to legacy/elementary/data/themes/images/bt_dis_hilight.png
diff --git a/legacy/elementary/data/themes/bt_dis_shine.png b/legacy/elementary/data/themes/images/bt_dis_shine.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_dis_shine.png
rename to legacy/elementary/data/themes/images/bt_dis_shine.png
diff --git a/legacy/elementary/data/themes/bt_glow.png b/legacy/elementary/data/themes/images/bt_glow.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_glow.png
rename to legacy/elementary/data/themes/images/bt_glow.png
diff --git a/legacy/elementary/data/themes/bt_hilight.png b/legacy/elementary/data/themes/images/bt_hilight.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_hilight.png
rename to legacy/elementary/data/themes/images/bt_hilight.png
diff --git a/legacy/elementary/data/themes/bt_hilightw.png b/legacy/elementary/data/themes/images/bt_hilightw.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_hilightw.png
rename to legacy/elementary/data/themes/images/bt_hilightw.png
diff --git a/legacy/elementary/data/themes/bt_shine.png b/legacy/elementary/data/themes/images/bt_shine.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_shine.png
rename to legacy/elementary/data/themes/images/bt_shine.png
diff --git a/legacy/elementary/data/themes/bt_sm_base1.png b/legacy/elementary/data/themes/images/bt_sm_base1.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_sm_base1.png
rename to legacy/elementary/data/themes/images/bt_sm_base1.png
diff --git a/legacy/elementary/data/themes/bt_sm_base2.png b/legacy/elementary/data/themes/images/bt_sm_base2.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_sm_base2.png
rename to legacy/elementary/data/themes/images/bt_sm_base2.png
diff --git a/legacy/elementary/data/themes/bt_sm_hilight.png b/legacy/elementary/data/themes/images/bt_sm_hilight.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_sm_hilight.png
rename to legacy/elementary/data/themes/images/bt_sm_hilight.png
diff --git a/legacy/elementary/data/themes/bt_sm_shine.png b/legacy/elementary/data/themes/images/bt_sm_shine.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_sm_shine.png
rename to legacy/elementary/data/themes/images/bt_sm_shine.png
diff --git a/legacy/elementary/data/themes/bt_spinner_down.png b/legacy/elementary/data/themes/images/bt_spinner_down.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_spinner_down.png
rename to legacy/elementary/data/themes/images/bt_spinner_down.png
diff --git a/legacy/elementary/data/themes/bt_spinner_hilight.png b/legacy/elementary/data/themes/images/bt_spinner_hilight.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_spinner_hilight.png
rename to legacy/elementary/data/themes/images/bt_spinner_hilight.png
diff --git a/legacy/elementary/data/themes/bt_spinner_up.png b/legacy/elementary/data/themes/images/bt_spinner_up.png
similarity index 100%
rename from legacy/elementary/data/themes/bt_spinner_up.png
rename to legacy/elementary/data/themes/images/bt_spinner_up.png
diff --git a/legacy/elementary/data/themes/bubble.png b/legacy/elementary/data/themes/images/bubble.png
similarity index 100%
rename from legacy/elementary/data/themes/bubble.png
rename to legacy/elementary/data/themes/images/bubble.png
diff --git a/legacy/elementary/data/themes/bubble_1.png b/legacy/elementary/data/themes/images/bubble_1.png
similarity index 100%
rename from legacy/elementary/data/themes/bubble_1.png
rename to legacy/elementary/data/themes/images/bubble_1.png
diff --git a/legacy/elementary/data/themes/bubble_2.png b/legacy/elementary/data/themes/images/bubble_2.png
similarity index 100%
rename from legacy/elementary/data/themes/bubble_2.png
rename to legacy/elementary/data/themes/images/bubble_2.png
diff --git a/legacy/elementary/data/themes/bubble_3.png b/legacy/elementary/data/themes/images/bubble_3.png
similarity index 100%
rename from legacy/elementary/data/themes/bubble_3.png
rename to legacy/elementary/data/themes/images/bubble_3.png
diff --git a/legacy/elementary/data/themes/bubble_4.png b/legacy/elementary/data/themes/images/bubble_4.png
similarity index 100%
rename from legacy/elementary/data/themes/bubble_4.png
rename to legacy/elementary/data/themes/images/bubble_4.png
diff --git a/legacy/elementary/data/themes/bubble_shine.png b/legacy/elementary/data/themes/images/bubble_shine.png
similarity index 100%
rename from legacy/elementary/data/themes/bubble_shine.png
rename to legacy/elementary/data/themes/images/bubble_shine.png
diff --git a/legacy/elementary/data/themes/bubble_shine3.png b/legacy/elementary/data/themes/images/bubble_shine3.png
similarity index 100%
rename from legacy/elementary/data/themes/bubble_shine3.png
rename to legacy/elementary/data/themes/images/bubble_shine3.png
diff --git a/legacy/elementary/data/themes/bubble_shine4.png b/legacy/elementary/data/themes/images/bubble_shine4.png
similarity index 100%
rename from legacy/elementary/data/themes/bubble_shine4.png
rename to legacy/elementary/data/themes/images/bubble_shine4.png
diff --git a/legacy/elementary/data/themes/busy-1.png b/legacy/elementary/data/themes/images/busy-1.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-1.png
rename to legacy/elementary/data/themes/images/busy-1.png
diff --git a/legacy/elementary/data/themes/busy-2.png b/legacy/elementary/data/themes/images/busy-2.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-2.png
rename to legacy/elementary/data/themes/images/busy-2.png
diff --git a/legacy/elementary/data/themes/busy-3.png b/legacy/elementary/data/themes/images/busy-3.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-3.png
rename to legacy/elementary/data/themes/images/busy-3.png
diff --git a/legacy/elementary/data/themes/busy-4.png b/legacy/elementary/data/themes/images/busy-4.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-4.png
rename to legacy/elementary/data/themes/images/busy-4.png
diff --git a/legacy/elementary/data/themes/busy-5.png b/legacy/elementary/data/themes/images/busy-5.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-5.png
rename to legacy/elementary/data/themes/images/busy-5.png
diff --git a/legacy/elementary/data/themes/busy-6.png b/legacy/elementary/data/themes/images/busy-6.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-6.png
rename to legacy/elementary/data/themes/images/busy-6.png
diff --git a/legacy/elementary/data/themes/busy-7.png b/legacy/elementary/data/themes/images/busy-7.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-7.png
rename to legacy/elementary/data/themes/images/busy-7.png
diff --git a/legacy/elementary/data/themes/busy-8.png b/legacy/elementary/data/themes/images/busy-8.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-8.png
rename to legacy/elementary/data/themes/images/busy-8.png
diff --git a/legacy/elementary/data/themes/busy-9.png b/legacy/elementary/data/themes/images/busy-9.png
similarity index 100%
rename from legacy/elementary/data/themes/busy-9.png
rename to legacy/elementary/data/themes/images/busy-9.png
diff --git a/legacy/elementary/data/themes/check.png b/legacy/elementary/data/themes/images/check.png
similarity index 100%
rename from legacy/elementary/data/themes/check.png
rename to legacy/elementary/data/themes/images/check.png
diff --git a/legacy/elementary/data/themes/check2.png b/legacy/elementary/data/themes/images/check2.png
similarity index 100%
rename from legacy/elementary/data/themes/check2.png
rename to legacy/elementary/data/themes/images/check2.png
diff --git a/legacy/elementary/data/themes/check_base.png b/legacy/elementary/data/themes/images/check_base.png
similarity index 100%
rename from legacy/elementary/data/themes/check_base.png
rename to legacy/elementary/data/themes/images/check_base.png
diff --git a/legacy/elementary/data/themes/color_picker_alpha.png b/legacy/elementary/data/themes/images/color_picker_alpha.png
similarity index 100%
rename from legacy/elementary/data/themes/color_picker_alpha.png
rename to legacy/elementary/data/themes/images/color_picker_alpha.png
diff --git a/legacy/elementary/data/themes/color_picker_alpha_bg.png b/legacy/elementary/data/themes/images/color_picker_alpha_bg.png
similarity index 100%
rename from legacy/elementary/data/themes/color_picker_alpha_bg.png
rename to legacy/elementary/data/themes/images/color_picker_alpha_bg.png
diff --git a/legacy/elementary/data/themes/color_picker_brightness.png b/legacy/elementary/data/themes/images/color_picker_brightness.png
similarity index 100%
rename from legacy/elementary/data/themes/color_picker_brightness.png
rename to legacy/elementary/data/themes/images/color_picker_brightness.png
diff --git a/legacy/elementary/data/themes/color_picker_color.png b/legacy/elementary/data/themes/images/color_picker_color.png
similarity index 100%
rename from legacy/elementary/data/themes/color_picker_color.png
rename to legacy/elementary/data/themes/images/color_picker_color.png
diff --git a/legacy/elementary/data/themes/color_picker_opacity.png b/legacy/elementary/data/themes/images/color_picker_opacity.png
similarity index 100%
rename from legacy/elementary/data/themes/color_picker_opacity.png
rename to legacy/elementary/data/themes/images/color_picker_opacity.png
diff --git a/legacy/elementary/data/themes/ctxpopup_arrow_down.png b/legacy/elementary/data/themes/images/ctxpopup_arrow_down.png
similarity index 100%
rename from legacy/elementary/data/themes/ctxpopup_arrow_down.png
rename to legacy/elementary/data/themes/images/ctxpopup_arrow_down.png
diff --git a/legacy/elementary/data/themes/ctxpopup_arrow_left.png b/legacy/elementary/data/themes/images/ctxpopup_arrow_left.png
similarity index 100%
rename from legacy/elementary/data/themes/ctxpopup_arrow_left.png
rename to legacy/elementary/data/themes/images/ctxpopup_arrow_left.png
diff --git a/legacy/elementary/data/themes/ctxpopup_arrow_right.png b/legacy/elementary/data/themes/images/ctxpopup_arrow_right.png
similarity index 100%
rename from legacy/elementary/data/themes/ctxpopup_arrow_right.png
rename to legacy/elementary/data/themes/images/ctxpopup_arrow_right.png
diff --git a/legacy/elementary/data/themes/ctxpopup_arrow_up.png b/legacy/elementary/data/themes/images/ctxpopup_arrow_up.png
similarity index 100%
rename from legacy/elementary/data/themes/ctxpopup_arrow_up.png
rename to legacy/elementary/data/themes/images/ctxpopup_arrow_up.png
diff --git a/legacy/elementary/data/themes/cur_box.png b/legacy/elementary/data/themes/images/cur_box.png
similarity index 100%
rename from legacy/elementary/data/themes/cur_box.png
rename to legacy/elementary/data/themes/images/cur_box.png
diff --git a/legacy/elementary/data/themes/cur_glow.png b/legacy/elementary/data/themes/images/cur_glow.png
similarity index 100%
rename from legacy/elementary/data/themes/cur_glow.png
rename to legacy/elementary/data/themes/images/cur_glow.png
diff --git a/legacy/elementary/data/themes/cur_hi.png b/legacy/elementary/data/themes/images/cur_hi.png
similarity index 100%
rename from legacy/elementary/data/themes/cur_hi.png
rename to legacy/elementary/data/themes/images/cur_hi.png
diff --git a/legacy/elementary/data/themes/cur_shad.png b/legacy/elementary/data/themes/images/cur_shad.png
similarity index 100%
rename from legacy/elementary/data/themes/cur_shad.png
rename to legacy/elementary/data/themes/images/cur_shad.png
diff --git a/legacy/elementary/data/themes/cur_shine.png b/legacy/elementary/data/themes/images/cur_shine.png
similarity index 100%
rename from legacy/elementary/data/themes/cur_shine.png
rename to legacy/elementary/data/themes/images/cur_shine.png
diff --git a/legacy/elementary/data/themes/dia_botshad.png b/legacy/elementary/data/themes/images/dia_botshad.png
similarity index 100%
rename from legacy/elementary/data/themes/dia_botshad.png
rename to legacy/elementary/data/themes/images/dia_botshad.png
diff --git a/legacy/elementary/data/themes/dia_grad.png b/legacy/elementary/data/themes/images/dia_grad.png
similarity index 100%
rename from legacy/elementary/data/themes/dia_grad.png
rename to legacy/elementary/data/themes/images/dia_grad.png
diff --git a/legacy/elementary/data/themes/dia_topshad.png b/legacy/elementary/data/themes/images/dia_topshad.png
similarity index 100%
rename from legacy/elementary/data/themes/dia_topshad.png
rename to legacy/elementary/data/themes/images/dia_topshad.png
diff --git a/legacy/elementary/data/themes/down.png b/legacy/elementary/data/themes/images/down.png
similarity index 100%
rename from legacy/elementary/data/themes/down.png
rename to legacy/elementary/data/themes/images/down.png
diff --git a/legacy/elementary/data/themes/emo-angry-shout.png b/legacy/elementary/data/themes/images/emo-angry-shout.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-angry-shout.png
rename to legacy/elementary/data/themes/images/emo-angry-shout.png
diff --git a/legacy/elementary/data/themes/emo-angry.png b/legacy/elementary/data/themes/images/emo-angry.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-angry.png
rename to legacy/elementary/data/themes/images/emo-angry.png
diff --git a/legacy/elementary/data/themes/emo-crazy-laugh.png b/legacy/elementary/data/themes/images/emo-crazy-laugh.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-crazy-laugh.png
rename to legacy/elementary/data/themes/images/emo-crazy-laugh.png
diff --git a/legacy/elementary/data/themes/emo-evil-laugh.png b/legacy/elementary/data/themes/images/emo-evil-laugh.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-evil-laugh.png
rename to legacy/elementary/data/themes/images/emo-evil-laugh.png
diff --git a/legacy/elementary/data/themes/emo-evil.png b/legacy/elementary/data/themes/images/emo-evil.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-evil.png
rename to legacy/elementary/data/themes/images/emo-evil.png
diff --git a/legacy/elementary/data/themes/emo-goggle-smile.png b/legacy/elementary/data/themes/images/emo-goggle-smile.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-goggle-smile.png
rename to legacy/elementary/data/themes/images/emo-goggle-smile.png
diff --git a/legacy/elementary/data/themes/emo-grumpy-smile.png b/legacy/elementary/data/themes/images/emo-grumpy-smile.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-grumpy-smile.png
rename to legacy/elementary/data/themes/images/emo-grumpy-smile.png
diff --git a/legacy/elementary/data/themes/emo-grumpy.png b/legacy/elementary/data/themes/images/emo-grumpy.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-grumpy.png
rename to legacy/elementary/data/themes/images/emo-grumpy.png
diff --git a/legacy/elementary/data/themes/emo-guilty-smile.png b/legacy/elementary/data/themes/images/emo-guilty-smile.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-guilty-smile.png
rename to legacy/elementary/data/themes/images/emo-guilty-smile.png
diff --git a/legacy/elementary/data/themes/emo-guilty.png b/legacy/elementary/data/themes/images/emo-guilty.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-guilty.png
rename to legacy/elementary/data/themes/images/emo-guilty.png
diff --git a/legacy/elementary/data/themes/emo-haha.png b/legacy/elementary/data/themes/images/emo-haha.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-haha.png
rename to legacy/elementary/data/themes/images/emo-haha.png
diff --git a/legacy/elementary/data/themes/emo-half-smile.png b/legacy/elementary/data/themes/images/emo-half-smile.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-half-smile.png
rename to legacy/elementary/data/themes/images/emo-half-smile.png
diff --git a/legacy/elementary/data/themes/emo-happy-panting.png b/legacy/elementary/data/themes/images/emo-happy-panting.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-happy-panting.png
rename to legacy/elementary/data/themes/images/emo-happy-panting.png
diff --git a/legacy/elementary/data/themes/emo-happy.png b/legacy/elementary/data/themes/images/emo-happy.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-happy.png
rename to legacy/elementary/data/themes/images/emo-happy.png
diff --git a/legacy/elementary/data/themes/emo-indifferent.png b/legacy/elementary/data/themes/images/emo-indifferent.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-indifferent.png
rename to legacy/elementary/data/themes/images/emo-indifferent.png
diff --git a/legacy/elementary/data/themes/emo-kiss.png b/legacy/elementary/data/themes/images/emo-kiss.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-kiss.png
rename to legacy/elementary/data/themes/images/emo-kiss.png
diff --git a/legacy/elementary/data/themes/emo-knowing-grin.png b/legacy/elementary/data/themes/images/emo-knowing-grin.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-knowing-grin.png
rename to legacy/elementary/data/themes/images/emo-knowing-grin.png
diff --git a/legacy/elementary/data/themes/emo-laugh.png b/legacy/elementary/data/themes/images/emo-laugh.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-laugh.png
rename to legacy/elementary/data/themes/images/emo-laugh.png
diff --git a/legacy/elementary/data/themes/emo-little-bit-sorry.png b/legacy/elementary/data/themes/images/emo-little-bit-sorry.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-little-bit-sorry.png
rename to legacy/elementary/data/themes/images/emo-little-bit-sorry.png
diff --git a/legacy/elementary/data/themes/emo-love-lots.png b/legacy/elementary/data/themes/images/emo-love-lots.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-love-lots.png
rename to legacy/elementary/data/themes/images/emo-love-lots.png
diff --git a/legacy/elementary/data/themes/emo-love.png b/legacy/elementary/data/themes/images/emo-love.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-love.png
rename to legacy/elementary/data/themes/images/emo-love.png
diff --git a/legacy/elementary/data/themes/emo-minimal-smile.png b/legacy/elementary/data/themes/images/emo-minimal-smile.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-minimal-smile.png
rename to legacy/elementary/data/themes/images/emo-minimal-smile.png
diff --git a/legacy/elementary/data/themes/emo-not-happy.png b/legacy/elementary/data/themes/images/emo-not-happy.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-not-happy.png
rename to legacy/elementary/data/themes/images/emo-not-happy.png
diff --git a/legacy/elementary/data/themes/emo-not-impressed.png b/legacy/elementary/data/themes/images/emo-not-impressed.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-not-impressed.png
rename to legacy/elementary/data/themes/images/emo-not-impressed.png
diff --git a/legacy/elementary/data/themes/emo-omg.png b/legacy/elementary/data/themes/images/emo-omg.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-omg.png
rename to legacy/elementary/data/themes/images/emo-omg.png
diff --git a/legacy/elementary/data/themes/emo-opensmile.png b/legacy/elementary/data/themes/images/emo-opensmile.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-opensmile.png
rename to legacy/elementary/data/themes/images/emo-opensmile.png
diff --git a/legacy/elementary/data/themes/emo-smile.png b/legacy/elementary/data/themes/images/emo-smile.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-smile.png
rename to legacy/elementary/data/themes/images/emo-smile.png
diff --git a/legacy/elementary/data/themes/emo-sorry.png b/legacy/elementary/data/themes/images/emo-sorry.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-sorry.png
rename to legacy/elementary/data/themes/images/emo-sorry.png
diff --git a/legacy/elementary/data/themes/emo-squint-laugh.png b/legacy/elementary/data/themes/images/emo-squint-laugh.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-squint-laugh.png
rename to legacy/elementary/data/themes/images/emo-squint-laugh.png
diff --git a/legacy/elementary/data/themes/emo-surprised.png b/legacy/elementary/data/themes/images/emo-surprised.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-surprised.png
rename to legacy/elementary/data/themes/images/emo-surprised.png
diff --git a/legacy/elementary/data/themes/emo-suspicious.png b/legacy/elementary/data/themes/images/emo-suspicious.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-suspicious.png
rename to legacy/elementary/data/themes/images/emo-suspicious.png
diff --git a/legacy/elementary/data/themes/emo-tongue-dangling.png b/legacy/elementary/data/themes/images/emo-tongue-dangling.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-tongue-dangling.png
rename to legacy/elementary/data/themes/images/emo-tongue-dangling.png
diff --git a/legacy/elementary/data/themes/emo-tongue-poke.png b/legacy/elementary/data/themes/images/emo-tongue-poke.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-tongue-poke.png
rename to legacy/elementary/data/themes/images/emo-tongue-poke.png
diff --git a/legacy/elementary/data/themes/emo-uh.png b/legacy/elementary/data/themes/images/emo-uh.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-uh.png
rename to legacy/elementary/data/themes/images/emo-uh.png
diff --git a/legacy/elementary/data/themes/emo-unhappy.png b/legacy/elementary/data/themes/images/emo-unhappy.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-unhappy.png
rename to legacy/elementary/data/themes/images/emo-unhappy.png
diff --git a/legacy/elementary/data/themes/emo-very-sorry.png b/legacy/elementary/data/themes/images/emo-very-sorry.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-very-sorry.png
rename to legacy/elementary/data/themes/images/emo-very-sorry.png
diff --git a/legacy/elementary/data/themes/emo-what.png b/legacy/elementary/data/themes/images/emo-what.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-what.png
rename to legacy/elementary/data/themes/images/emo-what.png
diff --git a/legacy/elementary/data/themes/emo-wink.png b/legacy/elementary/data/themes/images/emo-wink.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-wink.png
rename to legacy/elementary/data/themes/images/emo-wink.png
diff --git a/legacy/elementary/data/themes/emo-worried.png b/legacy/elementary/data/themes/images/emo-worried.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-worried.png
rename to legacy/elementary/data/themes/images/emo-worried.png
diff --git a/legacy/elementary/data/themes/emo-wtf.png b/legacy/elementary/data/themes/images/emo-wtf.png
similarity index 100%
rename from legacy/elementary/data/themes/emo-wtf.png
rename to legacy/elementary/data/themes/images/emo-wtf.png
diff --git a/legacy/elementary/data/themes/exclam.png b/legacy/elementary/data/themes/images/exclam.png
similarity index 100%
rename from legacy/elementary/data/themes/exclam.png
rename to legacy/elementary/data/themes/images/exclam.png
diff --git a/legacy/elementary/data/themes/flip_0b.png b/legacy/elementary/data/themes/images/flip_0b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_0b.png
rename to legacy/elementary/data/themes/images/flip_0b.png
diff --git a/legacy/elementary/data/themes/flip_0t.png b/legacy/elementary/data/themes/images/flip_0t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_0t.png
rename to legacy/elementary/data/themes/images/flip_0t.png
diff --git a/legacy/elementary/data/themes/flip_1b.png b/legacy/elementary/data/themes/images/flip_1b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_1b.png
rename to legacy/elementary/data/themes/images/flip_1b.png
diff --git a/legacy/elementary/data/themes/flip_1t.png b/legacy/elementary/data/themes/images/flip_1t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_1t.png
rename to legacy/elementary/data/themes/images/flip_1t.png
diff --git a/legacy/elementary/data/themes/flip_2b.png b/legacy/elementary/data/themes/images/flip_2b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_2b.png
rename to legacy/elementary/data/themes/images/flip_2b.png
diff --git a/legacy/elementary/data/themes/flip_2t.png b/legacy/elementary/data/themes/images/flip_2t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_2t.png
rename to legacy/elementary/data/themes/images/flip_2t.png
diff --git a/legacy/elementary/data/themes/flip_3b.png b/legacy/elementary/data/themes/images/flip_3b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_3b.png
rename to legacy/elementary/data/themes/images/flip_3b.png
diff --git a/legacy/elementary/data/themes/flip_3t.png b/legacy/elementary/data/themes/images/flip_3t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_3t.png
rename to legacy/elementary/data/themes/images/flip_3t.png
diff --git a/legacy/elementary/data/themes/flip_4b.png b/legacy/elementary/data/themes/images/flip_4b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_4b.png
rename to legacy/elementary/data/themes/images/flip_4b.png
diff --git a/legacy/elementary/data/themes/flip_4t.png b/legacy/elementary/data/themes/images/flip_4t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_4t.png
rename to legacy/elementary/data/themes/images/flip_4t.png
diff --git a/legacy/elementary/data/themes/flip_5b.png b/legacy/elementary/data/themes/images/flip_5b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_5b.png
rename to legacy/elementary/data/themes/images/flip_5b.png
diff --git a/legacy/elementary/data/themes/flip_5t.png b/legacy/elementary/data/themes/images/flip_5t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_5t.png
rename to legacy/elementary/data/themes/images/flip_5t.png
diff --git a/legacy/elementary/data/themes/flip_6b.png b/legacy/elementary/data/themes/images/flip_6b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_6b.png
rename to legacy/elementary/data/themes/images/flip_6b.png
diff --git a/legacy/elementary/data/themes/flip_6t.png b/legacy/elementary/data/themes/images/flip_6t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_6t.png
rename to legacy/elementary/data/themes/images/flip_6t.png
diff --git a/legacy/elementary/data/themes/flip_7b.png b/legacy/elementary/data/themes/images/flip_7b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_7b.png
rename to legacy/elementary/data/themes/images/flip_7b.png
diff --git a/legacy/elementary/data/themes/flip_7t.png b/legacy/elementary/data/themes/images/flip_7t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_7t.png
rename to legacy/elementary/data/themes/images/flip_7t.png
diff --git a/legacy/elementary/data/themes/flip_8b.png b/legacy/elementary/data/themes/images/flip_8b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_8b.png
rename to legacy/elementary/data/themes/images/flip_8b.png
diff --git a/legacy/elementary/data/themes/flip_8t.png b/legacy/elementary/data/themes/images/flip_8t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_8t.png
rename to legacy/elementary/data/themes/images/flip_8t.png
diff --git a/legacy/elementary/data/themes/flip_9b.png b/legacy/elementary/data/themes/images/flip_9b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_9b.png
rename to legacy/elementary/data/themes/images/flip_9b.png
diff --git a/legacy/elementary/data/themes/flip_9t.png b/legacy/elementary/data/themes/images/flip_9t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_9t.png
rename to legacy/elementary/data/themes/images/flip_9t.png
diff --git a/legacy/elementary/data/themes/flip_amb.png b/legacy/elementary/data/themes/images/flip_amb.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_amb.png
rename to legacy/elementary/data/themes/images/flip_amb.png
diff --git a/legacy/elementary/data/themes/flip_amt.png b/legacy/elementary/data/themes/images/flip_amt.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_amt.png
rename to legacy/elementary/data/themes/images/flip_amt.png
diff --git a/legacy/elementary/data/themes/flip_b.png b/legacy/elementary/data/themes/images/flip_b.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_b.png
rename to legacy/elementary/data/themes/images/flip_b.png
diff --git a/legacy/elementary/data/themes/flip_base.png b/legacy/elementary/data/themes/images/flip_base.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_base.png
rename to legacy/elementary/data/themes/images/flip_base.png
diff --git a/legacy/elementary/data/themes/flip_base_shad.png b/legacy/elementary/data/themes/images/flip_base_shad.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_base_shad.png
rename to legacy/elementary/data/themes/images/flip_base_shad.png
diff --git a/legacy/elementary/data/themes/flip_pmb.png b/legacy/elementary/data/themes/images/flip_pmb.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_pmb.png
rename to legacy/elementary/data/themes/images/flip_pmb.png
diff --git a/legacy/elementary/data/themes/flip_pmt.png b/legacy/elementary/data/themes/images/flip_pmt.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_pmt.png
rename to legacy/elementary/data/themes/images/flip_pmt.png
diff --git a/legacy/elementary/data/themes/flip_shad.png b/legacy/elementary/data/themes/images/flip_shad.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_shad.png
rename to legacy/elementary/data/themes/images/flip_shad.png
diff --git a/legacy/elementary/data/themes/flip_t.png b/legacy/elementary/data/themes/images/flip_t.png
similarity index 100%
rename from legacy/elementary/data/themes/flip_t.png
rename to legacy/elementary/data/themes/images/flip_t.png
diff --git a/legacy/elementary/data/themes/frame_1.png b/legacy/elementary/data/themes/images/frame_1.png
similarity index 100%
rename from legacy/elementary/data/themes/frame_1.png
rename to legacy/elementary/data/themes/images/frame_1.png
diff --git a/legacy/elementary/data/themes/frame_2.png b/legacy/elementary/data/themes/images/frame_2.png
similarity index 100%
rename from legacy/elementary/data/themes/frame_2.png
rename to legacy/elementary/data/themes/images/frame_2.png
diff --git a/legacy/elementary/data/themes/group_index.png b/legacy/elementary/data/themes/images/group_index.png
similarity index 100%
rename from legacy/elementary/data/themes/group_index.png
rename to legacy/elementary/data/themes/images/group_index.png
diff --git a/legacy/elementary/data/themes/head.png b/legacy/elementary/data/themes/images/head.png
similarity index 100%
rename from legacy/elementary/data/themes/head.png
rename to legacy/elementary/data/themes/images/head.png
diff --git a/legacy/elementary/data/themes/hoversel_entry_bg.png b/legacy/elementary/data/themes/images/hoversel_entry_bg.png
similarity index 100%
rename from legacy/elementary/data/themes/hoversel_entry_bg.png
rename to legacy/elementary/data/themes/images/hoversel_entry_bg.png
diff --git a/legacy/elementary/data/themes/icon_apps.png b/legacy/elementary/data/themes/images/icon_apps.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_apps.png
rename to legacy/elementary/data/themes/images/icon_apps.png
diff --git a/legacy/elementary/data/themes/icon_arrow_down.png b/legacy/elementary/data/themes/images/icon_arrow_down.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_arrow_down.png
rename to legacy/elementary/data/themes/images/icon_arrow_down.png
diff --git a/legacy/elementary/data/themes/icon_arrow_down_left.png b/legacy/elementary/data/themes/images/icon_arrow_down_left.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_arrow_down_left.png
rename to legacy/elementary/data/themes/images/icon_arrow_down_left.png
diff --git a/legacy/elementary/data/themes/icon_arrow_down_right.png b/legacy/elementary/data/themes/images/icon_arrow_down_right.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_arrow_down_right.png
rename to legacy/elementary/data/themes/images/icon_arrow_down_right.png
diff --git a/legacy/elementary/data/themes/icon_arrow_left.png b/legacy/elementary/data/themes/images/icon_arrow_left.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_arrow_left.png
rename to legacy/elementary/data/themes/images/icon_arrow_left.png
diff --git a/legacy/elementary/data/themes/icon_arrow_right.png b/legacy/elementary/data/themes/images/icon_arrow_right.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_arrow_right.png
rename to legacy/elementary/data/themes/images/icon_arrow_right.png
diff --git a/legacy/elementary/data/themes/icon_arrow_up.png b/legacy/elementary/data/themes/images/icon_arrow_up.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_arrow_up.png
rename to legacy/elementary/data/themes/images/icon_arrow_up.png
diff --git a/legacy/elementary/data/themes/icon_arrow_up_left.png b/legacy/elementary/data/themes/images/icon_arrow_up_left.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_arrow_up_left.png
rename to legacy/elementary/data/themes/images/icon_arrow_up_left.png
diff --git a/legacy/elementary/data/themes/icon_arrow_up_right.png b/legacy/elementary/data/themes/images/icon_arrow_up_right.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_arrow_up_right.png
rename to legacy/elementary/data/themes/images/icon_arrow_up_right.png
diff --git a/legacy/elementary/data/themes/icon_chat.png b/legacy/elementary/data/themes/images/icon_chat.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_chat.png
rename to legacy/elementary/data/themes/images/icon_chat.png
diff --git a/legacy/elementary/data/themes/icon_clock.png b/legacy/elementary/data/themes/images/icon_clock.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_clock.png
rename to legacy/elementary/data/themes/images/icon_clock.png
diff --git a/legacy/elementary/data/themes/icon_close.png b/legacy/elementary/data/themes/images/icon_close.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_close.png
rename to legacy/elementary/data/themes/images/icon_close.png
diff --git a/legacy/elementary/data/themes/icon_delete.png b/legacy/elementary/data/themes/images/icon_delete.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_delete.png
rename to legacy/elementary/data/themes/images/icon_delete.png
diff --git a/legacy/elementary/data/themes/icon_edit.png b/legacy/elementary/data/themes/images/icon_edit.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_edit.png
rename to legacy/elementary/data/themes/images/icon_edit.png
diff --git a/legacy/elementary/data/themes/icon_file.png b/legacy/elementary/data/themes/images/icon_file.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_file.png
rename to legacy/elementary/data/themes/images/icon_file.png
diff --git a/legacy/elementary/data/themes/icon_folder.png b/legacy/elementary/data/themes/images/icon_folder.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_folder.png
rename to legacy/elementary/data/themes/images/icon_folder.png
diff --git a/legacy/elementary/data/themes/icon_home.png b/legacy/elementary/data/themes/images/icon_home.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_home.png
rename to legacy/elementary/data/themes/images/icon_home.png
diff --git a/legacy/elementary/data/themes/icon_left_arrow.png b/legacy/elementary/data/themes/images/icon_left_arrow.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_left_arrow.png
rename to legacy/elementary/data/themes/images/icon_left_arrow.png
diff --git a/legacy/elementary/data/themes/icon_refresh.png b/legacy/elementary/data/themes/images/icon_refresh.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_refresh.png
rename to legacy/elementary/data/themes/images/icon_refresh.png
diff --git a/legacy/elementary/data/themes/icon_right_arrow.png b/legacy/elementary/data/themes/images/icon_right_arrow.png
similarity index 100%
rename from legacy/elementary/data/themes/icon_right_arrow.png
rename to legacy/elementary/data/themes/images/icon_right_arrow.png
diff --git a/legacy/elementary/data/themes/ilist_1.png b/legacy/elementary/data/themes/images/ilist_1.png
similarity index 100%
rename from legacy/elementary/data/themes/ilist_1.png
rename to legacy/elementary/data/themes/images/ilist_1.png
diff --git a/legacy/elementary/data/themes/ilist_1_h.png b/legacy/elementary/data/themes/images/ilist_1_h.png
similarity index 100%
rename from legacy/elementary/data/themes/ilist_1_h.png
rename to legacy/elementary/data/themes/images/ilist_1_h.png
diff --git a/legacy/elementary/data/themes/ilist_2.png b/legacy/elementary/data/themes/images/ilist_2.png
similarity index 100%
rename from legacy/elementary/data/themes/ilist_2.png
rename to legacy/elementary/data/themes/images/ilist_2.png
diff --git a/legacy/elementary/data/themes/ilist_2_h.png b/legacy/elementary/data/themes/images/ilist_2_h.png
similarity index 100%
rename from legacy/elementary/data/themes/ilist_2_h.png
rename to legacy/elementary/data/themes/images/ilist_2_h.png
diff --git a/legacy/elementary/data/themes/ilist_item_shadow.png b/legacy/elementary/data/themes/images/ilist_item_shadow.png
similarity index 100%
rename from legacy/elementary/data/themes/ilist_item_shadow.png
rename to legacy/elementary/data/themes/images/ilist_item_shadow.png
diff --git a/legacy/elementary/data/themes/ilist_item_shadow_h.png b/legacy/elementary/data/themes/images/ilist_item_shadow_h.png
similarity index 100%
rename from legacy/elementary/data/themes/ilist_item_shadow_h.png
rename to legacy/elementary/data/themes/images/ilist_item_shadow_h.png
diff --git a/legacy/elementary/data/themes/leftright.png b/legacy/elementary/data/themes/images/leftright.png
similarity index 100%
rename from legacy/elementary/data/themes/leftright.png
rename to legacy/elementary/data/themes/images/leftright.png
diff --git a/legacy/elementary/data/themes/map_circle.png b/legacy/elementary/data/themes/images/map_circle.png
similarity index 100%
rename from legacy/elementary/data/themes/map_circle.png
rename to legacy/elementary/data/themes/images/map_circle.png
diff --git a/legacy/elementary/data/themes/map_item.png b/legacy/elementary/data/themes/images/map_item.png
similarity index 100%
rename from legacy/elementary/data/themes/map_item.png
rename to legacy/elementary/data/themes/images/map_item.png
diff --git a/legacy/elementary/data/themes/map_scale.png b/legacy/elementary/data/themes/images/map_scale.png
similarity index 100%
rename from legacy/elementary/data/themes/map_scale.png
rename to legacy/elementary/data/themes/images/map_scale.png
diff --git a/legacy/elementary/data/themes/mp_forward.png b/legacy/elementary/data/themes/images/mp_forward.png
similarity index 100%
rename from legacy/elementary/data/themes/mp_forward.png
rename to legacy/elementary/data/themes/images/mp_forward.png
diff --git a/legacy/elementary/data/themes/mp_info.png b/legacy/elementary/data/themes/images/mp_info.png
similarity index 100%
rename from legacy/elementary/data/themes/mp_info.png
rename to legacy/elementary/data/themes/images/mp_info.png
diff --git a/legacy/elementary/data/themes/mp_next.png b/legacy/elementary/data/themes/images/mp_next.png
similarity index 100%
rename from legacy/elementary/data/themes/mp_next.png
rename to legacy/elementary/data/themes/images/mp_next.png
diff --git a/legacy/elementary/data/themes/mp_pause.png b/legacy/elementary/data/themes/images/mp_pause.png
similarity index 100%
rename from legacy/elementary/data/themes/mp_pause.png
rename to legacy/elementary/data/themes/images/mp_pause.png
diff --git a/legacy/elementary/data/themes/mp_play.png b/legacy/elementary/data/themes/images/mp_play.png
similarity index 100%
rename from legacy/elementary/data/themes/mp_play.png
rename to legacy/elementary/data/themes/images/mp_play.png
diff --git a/legacy/elementary/data/themes/mp_prev.png b/legacy/elementary/data/themes/images/mp_prev.png
similarity index 100%
rename from legacy/elementary/data/themes/mp_prev.png
rename to legacy/elementary/data/themes/images/mp_prev.png
diff --git a/legacy/elementary/data/themes/mp_rewind.png b/legacy/elementary/data/themes/images/mp_rewind.png
similarity index 100%
rename from legacy/elementary/data/themes/mp_rewind.png
rename to legacy/elementary/data/themes/images/mp_rewind.png
diff --git a/legacy/elementary/data/themes/mp_stop.png b/legacy/elementary/data/themes/images/mp_stop.png
similarity index 100%
rename from legacy/elementary/data/themes/mp_stop.png
rename to legacy/elementary/data/themes/images/mp_stop.png
diff --git a/legacy/elementary/data/themes/naviframe-base.jpg b/legacy/elementary/data/themes/images/naviframe-base.jpg
similarity index 100%
rename from legacy/elementary/data/themes/naviframe-base.jpg
rename to legacy/elementary/data/themes/images/naviframe-base.jpg
diff --git a/legacy/elementary/data/themes/outdent-bottom.png b/legacy/elementary/data/themes/images/outdent-bottom.png
similarity index 100%
rename from legacy/elementary/data/themes/outdent-bottom.png
rename to legacy/elementary/data/themes/images/outdent-bottom.png
diff --git a/legacy/elementary/data/themes/outdent-top.png b/legacy/elementary/data/themes/images/outdent-top.png
similarity index 100%
rename from legacy/elementary/data/themes/outdent-top.png
rename to legacy/elementary/data/themes/images/outdent-top.png
diff --git a/legacy/elementary/data/themes/pointer.png b/legacy/elementary/data/themes/images/pointer.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer.png
rename to legacy/elementary/data/themes/images/pointer.png
diff --git a/legacy/elementary/data/themes/pointer_glint_01.png b/legacy/elementary/data/themes/images/pointer_glint_01.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_01.png
rename to legacy/elementary/data/themes/images/pointer_glint_01.png
diff --git a/legacy/elementary/data/themes/pointer_glint_02.png b/legacy/elementary/data/themes/images/pointer_glint_02.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_02.png
rename to legacy/elementary/data/themes/images/pointer_glint_02.png
diff --git a/legacy/elementary/data/themes/pointer_glint_03.png b/legacy/elementary/data/themes/images/pointer_glint_03.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_03.png
rename to legacy/elementary/data/themes/images/pointer_glint_03.png
diff --git a/legacy/elementary/data/themes/pointer_glint_04.png b/legacy/elementary/data/themes/images/pointer_glint_04.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_04.png
rename to legacy/elementary/data/themes/images/pointer_glint_04.png
diff --git a/legacy/elementary/data/themes/pointer_glint_05.png b/legacy/elementary/data/themes/images/pointer_glint_05.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_05.png
rename to legacy/elementary/data/themes/images/pointer_glint_05.png
diff --git a/legacy/elementary/data/themes/pointer_glint_06.png b/legacy/elementary/data/themes/images/pointer_glint_06.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_06.png
rename to legacy/elementary/data/themes/images/pointer_glint_06.png
diff --git a/legacy/elementary/data/themes/pointer_glint_07.png b/legacy/elementary/data/themes/images/pointer_glint_07.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_07.png
rename to legacy/elementary/data/themes/images/pointer_glint_07.png
diff --git a/legacy/elementary/data/themes/pointer_glint_08.png b/legacy/elementary/data/themes/images/pointer_glint_08.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_08.png
rename to legacy/elementary/data/themes/images/pointer_glint_08.png
diff --git a/legacy/elementary/data/themes/pointer_glint_09.png b/legacy/elementary/data/themes/images/pointer_glint_09.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_09.png
rename to legacy/elementary/data/themes/images/pointer_glint_09.png
diff --git a/legacy/elementary/data/themes/pointer_glint_10.png b/legacy/elementary/data/themes/images/pointer_glint_10.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_10.png
rename to legacy/elementary/data/themes/images/pointer_glint_10.png
diff --git a/legacy/elementary/data/themes/pointer_glint_11.png b/legacy/elementary/data/themes/images/pointer_glint_11.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_11.png
rename to legacy/elementary/data/themes/images/pointer_glint_11.png
diff --git a/legacy/elementary/data/themes/pointer_glint_12.png b/legacy/elementary/data/themes/images/pointer_glint_12.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glint_12.png
rename to legacy/elementary/data/themes/images/pointer_glint_12.png
diff --git a/legacy/elementary/data/themes/pointer_glow.png b/legacy/elementary/data/themes/images/pointer_glow.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_glow.png
rename to legacy/elementary/data/themes/images/pointer_glow.png
diff --git a/legacy/elementary/data/themes/pointer_mono.png b/legacy/elementary/data/themes/images/pointer_mono.png
similarity index 100%
rename from legacy/elementary/data/themes/pointer_mono.png
rename to legacy/elementary/data/themes/images/pointer_mono.png
diff --git a/legacy/elementary/data/themes/radio.png b/legacy/elementary/data/themes/images/radio.png
similarity index 100%
rename from legacy/elementary/data/themes/radio.png
rename to legacy/elementary/data/themes/images/radio.png
diff --git a/legacy/elementary/data/themes/radio2.png b/legacy/elementary/data/themes/images/radio2.png
similarity index 100%
rename from legacy/elementary/data/themes/radio2.png
rename to legacy/elementary/data/themes/images/radio2.png
diff --git a/legacy/elementary/data/themes/radio_base.png b/legacy/elementary/data/themes/images/radio_base.png
similarity index 100%
rename from legacy/elementary/data/themes/radio_base.png
rename to legacy/elementary/data/themes/images/radio_base.png
diff --git a/legacy/elementary/data/themes/sb_runnerh.png b/legacy/elementary/data/themes/images/sb_runnerh.png
similarity index 100%
rename from legacy/elementary/data/themes/sb_runnerh.png
rename to legacy/elementary/data/themes/images/sb_runnerh.png
diff --git a/legacy/elementary/data/themes/sb_runnerv.png b/legacy/elementary/data/themes/images/sb_runnerv.png
similarity index 100%
rename from legacy/elementary/data/themes/sb_runnerv.png
rename to legacy/elementary/data/themes/images/sb_runnerv.png
diff --git a/legacy/elementary/data/themes/seg_left_normal.png b/legacy/elementary/data/themes/images/seg_left_normal.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_left_normal.png
rename to legacy/elementary/data/themes/images/seg_left_normal.png
diff --git a/legacy/elementary/data/themes/seg_left_pressed.png b/legacy/elementary/data/themes/images/seg_left_pressed.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_left_pressed.png
rename to legacy/elementary/data/themes/images/seg_left_pressed.png
diff --git a/legacy/elementary/data/themes/seg_left_selected.png b/legacy/elementary/data/themes/images/seg_left_selected.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_left_selected.png
rename to legacy/elementary/data/themes/images/seg_left_selected.png
diff --git a/legacy/elementary/data/themes/seg_middle_normal.png b/legacy/elementary/data/themes/images/seg_middle_normal.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_middle_normal.png
rename to legacy/elementary/data/themes/images/seg_middle_normal.png
diff --git a/legacy/elementary/data/themes/seg_middle_pressed.png b/legacy/elementary/data/themes/images/seg_middle_pressed.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_middle_pressed.png
rename to legacy/elementary/data/themes/images/seg_middle_pressed.png
diff --git a/legacy/elementary/data/themes/seg_middle_selected.png b/legacy/elementary/data/themes/images/seg_middle_selected.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_middle_selected.png
rename to legacy/elementary/data/themes/images/seg_middle_selected.png
diff --git a/legacy/elementary/data/themes/seg_right_normal.png b/legacy/elementary/data/themes/images/seg_right_normal.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_right_normal.png
rename to legacy/elementary/data/themes/images/seg_right_normal.png
diff --git a/legacy/elementary/data/themes/seg_right_pressed.png b/legacy/elementary/data/themes/images/seg_right_pressed.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_right_pressed.png
rename to legacy/elementary/data/themes/images/seg_right_pressed.png
diff --git a/legacy/elementary/data/themes/seg_right_selected.png b/legacy/elementary/data/themes/images/seg_right_selected.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_right_selected.png
rename to legacy/elementary/data/themes/images/seg_right_selected.png
diff --git a/legacy/elementary/data/themes/seg_single_normal.png b/legacy/elementary/data/themes/images/seg_single_normal.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_single_normal.png
rename to legacy/elementary/data/themes/images/seg_single_normal.png
diff --git a/legacy/elementary/data/themes/seg_single_pressed.png b/legacy/elementary/data/themes/images/seg_single_pressed.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_single_pressed.png
rename to legacy/elementary/data/themes/images/seg_single_pressed.png
diff --git a/legacy/elementary/data/themes/seg_single_selected.png b/legacy/elementary/data/themes/images/seg_single_selected.png
similarity index 100%
rename from legacy/elementary/data/themes/seg_single_selected.png
rename to legacy/elementary/data/themes/images/seg_single_selected.png
diff --git a/legacy/elementary/data/themes/separator_h.png b/legacy/elementary/data/themes/images/separator_h.png
similarity index 100%
rename from legacy/elementary/data/themes/separator_h.png
rename to legacy/elementary/data/themes/images/separator_h.png
diff --git a/legacy/elementary/data/themes/separator_v.png b/legacy/elementary/data/themes/images/separator_v.png
similarity index 100%
rename from legacy/elementary/data/themes/separator_v.png
rename to legacy/elementary/data/themes/images/separator_v.png
diff --git a/legacy/elementary/data/themes/shad_circ.png b/legacy/elementary/data/themes/images/shad_circ.png
similarity index 100%
rename from legacy/elementary/data/themes/shad_circ.png
rename to legacy/elementary/data/themes/images/shad_circ.png
diff --git a/legacy/elementary/data/themes/shadow.png b/legacy/elementary/data/themes/images/shadow.png
similarity index 100%
rename from legacy/elementary/data/themes/shadow.png
rename to legacy/elementary/data/themes/images/shadow.png
diff --git a/legacy/elementary/data/themes/shelf_inset.png b/legacy/elementary/data/themes/images/shelf_inset.png
similarity index 100%
rename from legacy/elementary/data/themes/shelf_inset.png
rename to legacy/elementary/data/themes/images/shelf_inset.png
diff --git a/legacy/elementary/data/themes/sl_bg.png b/legacy/elementary/data/themes/images/sl_bg.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bg.png
rename to legacy/elementary/data/themes/images/sl_bg.png
diff --git a/legacy/elementary/data/themes/sl_bg_over.png b/legacy/elementary/data/themes/images/sl_bg_over.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bg_over.png
rename to legacy/elementary/data/themes/images/sl_bg_over.png
diff --git a/legacy/elementary/data/themes/sl_bt2_0_0.png b/legacy/elementary/data/themes/images/sl_bt2_0_0.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt2_0_0.png
rename to legacy/elementary/data/themes/images/sl_bt2_0_0.png
diff --git a/legacy/elementary/data/themes/sl_bt2_0_1.png b/legacy/elementary/data/themes/images/sl_bt2_0_1.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt2_0_1.png
rename to legacy/elementary/data/themes/images/sl_bt2_0_1.png
diff --git a/legacy/elementary/data/themes/sl_bt2_0_2.png b/legacy/elementary/data/themes/images/sl_bt2_0_2.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt2_0_2.png
rename to legacy/elementary/data/themes/images/sl_bt2_0_2.png
diff --git a/legacy/elementary/data/themes/sl_bt2_1.png b/legacy/elementary/data/themes/images/sl_bt2_1.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt2_1.png
rename to legacy/elementary/data/themes/images/sl_bt2_1.png
diff --git a/legacy/elementary/data/themes/sl_bt2_2.png b/legacy/elementary/data/themes/images/sl_bt2_2.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt2_2.png
rename to legacy/elementary/data/themes/images/sl_bt2_2.png
diff --git a/legacy/elementary/data/themes/sl_bt_0.png b/legacy/elementary/data/themes/images/sl_bt_0.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt_0.png
rename to legacy/elementary/data/themes/images/sl_bt_0.png
diff --git a/legacy/elementary/data/themes/sl_bt_1.png b/legacy/elementary/data/themes/images/sl_bt_1.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt_1.png
rename to legacy/elementary/data/themes/images/sl_bt_1.png
diff --git a/legacy/elementary/data/themes/sl_bt_2.png b/legacy/elementary/data/themes/images/sl_bt_2.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt_2.png
rename to legacy/elementary/data/themes/images/sl_bt_2.png
diff --git a/legacy/elementary/data/themes/sl_bt_3.png b/legacy/elementary/data/themes/images/sl_bt_3.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_bt_3.png
rename to legacy/elementary/data/themes/images/sl_bt_3.png
diff --git a/legacy/elementary/data/themes/sl_units.png b/legacy/elementary/data/themes/images/sl_units.png
similarity index 100%
rename from legacy/elementary/data/themes/sl_units.png
rename to legacy/elementary/data/themes/images/sl_units.png
diff --git a/legacy/elementary/data/themes/slv_bg.png b/legacy/elementary/data/themes/images/slv_bg.png
similarity index 100%
rename from legacy/elementary/data/themes/slv_bg.png
rename to legacy/elementary/data/themes/images/slv_bg.png
diff --git a/legacy/elementary/data/themes/slv_bg_over.png b/legacy/elementary/data/themes/images/slv_bg_over.png
similarity index 100%
rename from legacy/elementary/data/themes/slv_bg_over.png
rename to legacy/elementary/data/themes/images/slv_bg_over.png
diff --git a/legacy/elementary/data/themes/slv_units.png b/legacy/elementary/data/themes/images/slv_units.png
similarity index 100%
rename from legacy/elementary/data/themes/slv_units.png
rename to legacy/elementary/data/themes/images/slv_units.png
diff --git a/legacy/elementary/data/themes/sp_bt_l.png b/legacy/elementary/data/themes/images/sp_bt_l.png
similarity index 100%
rename from legacy/elementary/data/themes/sp_bt_l.png
rename to legacy/elementary/data/themes/images/sp_bt_l.png
diff --git a/legacy/elementary/data/themes/sp_bt_r.png b/legacy/elementary/data/themes/images/sp_bt_r.png
similarity index 100%
rename from legacy/elementary/data/themes/sp_bt_r.png
rename to legacy/elementary/data/themes/images/sp_bt_r.png
diff --git a/legacy/elementary/data/themes/thumb_shadow.png b/legacy/elementary/data/themes/images/thumb_shadow.png
similarity index 100%
rename from legacy/elementary/data/themes/thumb_shadow.png
rename to legacy/elementary/data/themes/images/thumb_shadow.png
diff --git a/legacy/elementary/data/themes/tog_base_off.png b/legacy/elementary/data/themes/images/tog_base_off.png
similarity index 100%
rename from legacy/elementary/data/themes/tog_base_off.png
rename to legacy/elementary/data/themes/images/tog_base_off.png
diff --git a/legacy/elementary/data/themes/tog_base_on.png b/legacy/elementary/data/themes/images/tog_base_on.png
similarity index 100%
rename from legacy/elementary/data/themes/tog_base_on.png
rename to legacy/elementary/data/themes/images/tog_base_on.png
diff --git a/legacy/elementary/data/themes/tog_dis_base_off.png b/legacy/elementary/data/themes/images/tog_dis_base_off.png
similarity index 100%
rename from legacy/elementary/data/themes/tog_dis_base_off.png
rename to legacy/elementary/data/themes/images/tog_dis_base_off.png
diff --git a/legacy/elementary/data/themes/tog_dis_base_on.png b/legacy/elementary/data/themes/images/tog_dis_base_on.png
similarity index 100%
rename from legacy/elementary/data/themes/tog_dis_base_on.png
rename to legacy/elementary/data/themes/images/tog_dis_base_on.png
diff --git a/legacy/elementary/data/themes/toolbar_sel.png b/legacy/elementary/data/themes/images/toolbar_sel.png
similarity index 100%
rename from legacy/elementary/data/themes/toolbar_sel.png
rename to legacy/elementary/data/themes/images/toolbar_sel.png
diff --git a/legacy/elementary/data/themes/toolbar_separator_h.png b/legacy/elementary/data/themes/images/toolbar_separator_h.png
similarity index 100%
rename from legacy/elementary/data/themes/toolbar_separator_h.png
rename to legacy/elementary/data/themes/images/toolbar_separator_h.png
diff --git a/legacy/elementary/data/themes/toolbar_separator_v.png b/legacy/elementary/data/themes/images/toolbar_separator_v.png
similarity index 100%
rename from legacy/elementary/data/themes/toolbar_separator_v.png
rename to legacy/elementary/data/themes/images/toolbar_separator_v.png
diff --git a/legacy/elementary/data/themes/tooltip-base.png b/legacy/elementary/data/themes/images/tooltip-base.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-base.png
rename to legacy/elementary/data/themes/images/tooltip-base.png
diff --git a/legacy/elementary/data/themes/tooltip-corner-bottom-left-tip.png b/legacy/elementary/data/themes/images/tooltip-corner-bottom-left-tip.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-corner-bottom-left-tip.png
rename to legacy/elementary/data/themes/images/tooltip-corner-bottom-left-tip.png
diff --git a/legacy/elementary/data/themes/tooltip-corner-bottom-right-tip.png b/legacy/elementary/data/themes/images/tooltip-corner-bottom-right-tip.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-corner-bottom-right-tip.png
rename to legacy/elementary/data/themes/images/tooltip-corner-bottom-right-tip.png
diff --git a/legacy/elementary/data/themes/tooltip-corner-top-left-tip.png b/legacy/elementary/data/themes/images/tooltip-corner-top-left-tip.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-corner-top-left-tip.png
rename to legacy/elementary/data/themes/images/tooltip-corner-top-left-tip.png
diff --git a/legacy/elementary/data/themes/tooltip-corner-top-right-tip.png b/legacy/elementary/data/themes/images/tooltip-corner-top-right-tip.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-corner-top-right-tip.png
rename to legacy/elementary/data/themes/images/tooltip-corner-top-right-tip.png
diff --git a/legacy/elementary/data/themes/tooltip-edge-bottom-tip.png b/legacy/elementary/data/themes/images/tooltip-edge-bottom-tip.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-edge-bottom-tip.png
rename to legacy/elementary/data/themes/images/tooltip-edge-bottom-tip.png
diff --git a/legacy/elementary/data/themes/tooltip-edge-left-tip.png b/legacy/elementary/data/themes/images/tooltip-edge-left-tip.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-edge-left-tip.png
rename to legacy/elementary/data/themes/images/tooltip-edge-left-tip.png
diff --git a/legacy/elementary/data/themes/tooltip-edge-right-tip.png b/legacy/elementary/data/themes/images/tooltip-edge-right-tip.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-edge-right-tip.png
rename to legacy/elementary/data/themes/images/tooltip-edge-right-tip.png
diff --git a/legacy/elementary/data/themes/tooltip-edge-top-tip.png b/legacy/elementary/data/themes/images/tooltip-edge-top-tip.png
similarity index 100%
rename from legacy/elementary/data/themes/tooltip-edge-top-tip.png
rename to legacy/elementary/data/themes/images/tooltip-edge-top-tip.png
diff --git a/legacy/elementary/data/themes/up.png b/legacy/elementary/data/themes/images/up.png
similarity index 100%
rename from legacy/elementary/data/themes/up.png
rename to legacy/elementary/data/themes/images/up.png
diff --git a/legacy/elementary/data/themes/updown.png b/legacy/elementary/data/themes/images/updown.png
similarity index 100%
rename from legacy/elementary/data/themes/updown.png
rename to legacy/elementary/data/themes/images/updown.png