From 3dba10661e2115fee38fe966fc819a58e5e5e10a Mon Sep 17 00:00:00 2001
From: Olliver Schinagl <o.schinagl@ultimaker.com>
Date: Tue, 14 Apr 2015 08:19:13 +0200
Subject: update most basic theme components

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
---
 data/themes/Makefile.am                   |   2 +-
 data/themes/default/Makefile.am           | 467 +-----------------------------
 data/themes/default/colorclasses.edc      |   6 +
 data/themes/default/default.edc           | 106 +++----
 data/themes/default/edc/elm/bg.edc        |  51 ++--
 data/themes/default/edc/elm/separator.edc |  46 ++-
 6 files changed, 103 insertions(+), 575 deletions(-)

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 3289beb..598c0fa 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = ulticontroller_2.0
+SUBDIRS = default ulticontroller_2.0
diff --git a/data/themes/default/Makefile.am b/data/themes/default/Makefile.am
index beabf8e..8c9ea90 100644
--- a/data/themes/default/Makefile.am
+++ b/data/themes/default/Makefile.am
@@ -98,469 +98,4 @@ edc/elm/tooltip.edc \
 edc/elm/video.edc \
 edc/elm/win.edc
 
-images = \
-img/access_glow.png \
-img/add_glow_small.png \
-img/ball_small_glow_intense.png \
-img/ball_small_glow.png \
-img/bar_shine.png \
-img/bat_base.png \
-img/bat_bottom0.png \
-img/bat_bottom1.png \
-img/bat_shadow.png \
-img/bat_shine.png \
-img/bat_top0.png \
-img/bat_top1.png \
-img/bevel_curved_horiz_out.png \
-img/bevel_curved_vert_out.png \
-img/bevel_dark_in.png \
-img/bevel_dark_out.png \
-img/bevel_horiz_out.png \
-img/bevel_in.png \
-img/bevel_out.png \
-img/bg_glow_in.png \
-img/bg_radgrad.png \
-img/big_arrow_down.png \
-img/big_arrow_down_shadow.png \
-img/big_arrow_left.png \
-img/big_arrow_left_shadow.png \
-img/big_arrow_right.png \
-img/big_arrow_right_shadow.png \
-img/big_arrow_up.png \
-img/big_arrow_up_shadow.png \
-img/box_glow.png \
-img/box_outline.png \
-img/bt_base.png \
-img/bt_sig_1.png \
-img/bt_sig_2.png \
-img/btn_round_0.png \
-img/btn_round_1.png \
-img/btn_round_2.png \
-img/bub_base_b0.png \
-img/bub_base_b1.png \
-img/bub_base_b2.png \
-img/bub_base_bl.png \
-img/bub_base_br.png \
-img/bub_base_tl.png \
-img/bub_base_tr.png \
-img/bub_over_bot.png \
-img/bub_over_top.png \
-img/bulb_glow.png \
-img/bulb_off.png \
-img/bulb_on.png \
-img/bulb_over.png \
-img/button_clicked.png \
-img/button_normal.png \
-img/cell_base.png \
-img/cell_sig_1.png \
-img/cell_sig_2.png \
-img/cell_sig_3.png \
-img/cell_sig_4.png \
-img/clock_base.png \
-img/color_picker_alpha.png \
-img/color_picker_brightness.png \
-img/color_picker_color.png \
-img/color_picker_opacity.png \
-img/col_sel_end_bottom.png \
-img/col_sel_end_left.png \
-img/col_sel_end_right.png \
-img/col_sel_end_top.png \
-img/darken_rounded_square_half_h.png \
-img/darken_rounded_square_half.png \
-img/darken_rounded_square.png \
-img/day_left_normal.png \
-img/day_left_press.png \
-img/day_left_selected.png \
-img/day_middle_normal.png \
-img/day_middle_press.png \
-img/day_middle_selected.png \
-img/day_right_normal.png \
-img/day_right_press.png \
-img/day_right_selected.png \
-img/day_single_normal.png \
-img/day_single_press.png \
-img/day_single_selected.png \
-img/diagonal_stripes.png \
-img/digit_0.png \
-img/digit_1.png \
-img/digit_2.png \
-img/digit_3.png \
-img/digit_4.png \
-img/digit_5.png \
-img/digit_6.png \
-img/digit_7.png \
-img/digit_8.png \
-img/digit_9.png \
-img/digit_am.png \
-img/digit_na.png \
-img/digit_nm.png \
-img/digit_pm.png \
-img/dot_pattern.png \
-img/downlight_glow_left.png \
-img/downlight_glow.png \
-img/downlight_glow_right.png \
-img/downlight_glow_up.png \
-img/emo-angry.png \
-img/emo-angry-shout.png \
-img/emo-crazy-laugh.png \
-img/emo-evil-laugh.png \
-img/emo-evil.png \
-img/emo-goggle-smile.png \
-img/emo-grumpy.png \
-img/emo-grumpy-smile.png \
-img/emo-guilty.png \
-img/emo-guilty-smile.png \
-img/emo-haha.png \
-img/emo-half-smile.png \
-img/emo-happy-panting.png \
-img/emo-happy.png \
-img/emo-indifferent.png \
-img/emo-kiss.png \
-img/emo-knowing-grin.png \
-img/emo-laugh.png \
-img/emo-little-bit-sorry.png \
-img/emo-love-lots.png \
-img/emo-love.png \
-img/emo-minimal-smile.png \
-img/emo-not-happy.png \
-img/emo-not-impressed.png \
-img/emo-omg.png \
-img/emo-opensmile.png \
-img/emo-smile.png \
-img/emo-sorry.png \
-img/emo-squint-laugh.png \
-img/emo-surprised.png \
-img/emo-suspicious.png \
-img/emo-tongue-dangling.png \
-img/emo-tongue-poke.png \
-img/emo-uh.png \
-img/emo-unhappy.png \
-img/emo-very-sorry.png \
-img/emo-what.png \
-img/emo-wink.png \
-img/emo-worried.png \
-img/emo-wtf.png \
-img/eth.png \
-img/exlclam.png \
-img/flip_base_shad.png \
-img/flip_shad.png \
-img/frame_rounded.png \
-img/glow_exclam.png \
-img/glow_lock_double.png \
-img/glow_lock_locked.png \
-img/glow_lock_unlocked.png \
-img/glow_med_white.png \
-img/glow_round_corners.png \
-img/glow_round_corners_small.png \
-img/glow_small.png \
-img/handle_pick_up_left.png \
-img/handle_pick_up_right.png \
-img/hole_pixel.png \
-img/holes_horiz.png \
-img/holes_tiny_glow_horiz.png \
-img/holes_tiny_glow_vert.png \
-img/holes_tiny_horiz.png \
-img/holes_tiny_vert.png \
-img/holes_vert.png \
-img/hole_tiny.png \
-img/home_glow.png \
-img/home_hilight.png \
-img/home_inset.png \
-img/horiz_bar_inset.png \
-img/horiz_glow_run_big.png \
-img/horiz_glow_run.png \
-img/horiz_glow_run_rev.png \
-img/horizontal_separated_bar_glow.png \
-img/horizontal_separated_bar_small_glow.png \
-img/icon_apps.png \
-img/icon_arrow_down_left.png \
-img/icon_arrow_down.png \
-img/icon_arrow_down_right.png \
-img/icon_arrow_left.png \
-img/icon_arrow_right.png \
-img/icon_arrow_up_left.png \
-img/icon_arrow_up.png \
-img/icon_arrow_up_right.png \
-img/icon_border_border.png \
-img/icon_border_close.png \
-img/icon_border_kill.png \
-img/icon_border_lock.png \
-img/icon_border_maximize.png \
-img/icon_border_minimize.png \
-img/icon_border_more.png \
-img/icon_border_move.png \
-img/icon_border_pager.png \
-img/icon_border_pin.png \
-img/icon_border_properties.png \
-img/icon_border_remember.png \
-img/icon_border_resize.png \
-img/icon_border_sendto.png \
-img/icon_border_shaded.png \
-img/icon_border_skip.png \
-img/icon_border_stack_bot.png \
-img/icon_border_stack_norm.png \
-img/icon_border_stack_top.png \
-img/icon_chat.png \
-img/icon_clock.png \
-img/icon_close.png \
-img/icon_delete.png \
-img/icon_edit.png \
-img/icon_eject_mono.png \
-img/icon_eject.png \
-img/icon_enlightenment.png \
-img/icon_file.png \
-img/icon_folder.png \
-img/icon_forward_mono.png \
-img/icon_forward.png \
-img/icon_head.png \
-img/icon_home.png \
-img/icon_info_mono.png \
-img/icon_info.png \
-img/icon_mute_mono.png \
-img/icon_mute.png \
-img/icon_next_mono.png \
-img/icon_next.png \
-img/icon_pause_mono.png \
-img/icon_pause.png \
-img/icon_play_mono.png \
-img/icon_play.png \
-img/icon_preferences-applications-personal.png \
-img/icon_preferences-applications-screen-lock.png \
-img/icon_preferences-applications-screen-unlock.png \
-img/icon_preferences-composite.png \
-img/icon_preferences-desklock-locale.png \
-img/icon_preferences-desktop-environments.png \
-img/icon_preferences-desktop-signal-bindings.png \
-img/icon_preferences-interaction.png \
-img/icon_preferences-variables.png \
-img/icon_prev_mono.png \
-img/icon_prev.png \
-img/icon_refresh.png \
-img/icon_rewind_mono.png \
-img/icon_rewind.png \
-img/icon_search.png  \
-img/icon_spanner.png  \
-img/icon_splat.png \
-img/icon_splat_half.png \
-img/icon_stop_mono.png \
-img/icon_stop.png \
-img/icon_system-lock-screen.png \
-img/icon_system-log-out.png \
-img/icon_system.png \
-img/icon_system-restart.png \
-img/icon_system-shutdown.png \
-img/icon_system-suspend-hibernate.png \
-img/icon_system-suspend.png \
-img/icon_volume_mono.png \
-img/icon_volume.png \
-img/icon_wallpaper_center.png \
-img/icon_wallpaper_fill.png \
-img/icon_wallpaper_pan.png \
-img/icon_wallpaper_stretch.png \
-img/icon_wallpaper_tile.png \
-img/icon_wallpaper_within.png \
-img/icon_warning.png \
-img/ic_win_move.png \
-img/ic_win_resize.png \
-img/img_example_1.png \
-img/img_example_2.png \
-img/inset_bar_horiz_base.png \
-img/inset_bar_horiz_glow_base_double.png \
-img/inset_bar_horiz_glow_base.png \
-img/inset_bar_horiz_glow_inv_base_double.png \
-img/inset_bar_horiz_glow_inv_base.png \
-img/inset_bar_horiz_glow_inv_light.png \
-img/inset_bar_horiz_glow_light.png \
-img/inset_bar_horiz_glow_mid_base.png \
-img/inset_bar_horiz_glow_mid_light.png \
-img/inset_bar_horiz_inside_base.png \
-img/inset_bar_horiz_inside_light.png \
-img/inset_bar_horiz_light.png \
-img/inset_bar_vert_base.png \
-img/inset_bar_vert_glow_base_double.png \
-img/inset_bar_vert_glow_base.png \
-img/inset_bar_vert_glow_inv_base_double.png \
-img/inset_bar_vert_glow_inv_base.png \
-img/inset_bar_vert_glow_inv_light.png \
-img/inset_bar_vert_glow_light.png \
-img/inset_bar_vert_glow_mid_base.png \
-img/inset_bar_vert_glow_mid_light.png \
-img/inset_bar_vert_inside_base.png \
-img/inset_bar_vert_inside_light.png \
-img/inset_bar_vert_light.png \
-img/inset_circle_tiny.png \
-img/inset_round_hilight.png \
-img/inset_round_shading.png \
-img/inset_round_shadow.png \
-img/inset_shadow_circle_tiny.png \
-img/inset_shadow.png \
-img/inset_shadow_tiny.png \
-img/kbd_glow.png \
-img/kbd_hilight.png \
-img/kbd_inset.png \
-img/knob_round_busy.png \
-img/knob_round_small_busy.png \
-img/knob_round_small_normal.png \
-img/knob_round_small_selected.png \
-img/knob_sz_04.png \
-img/knob_sz_06.png \
-img/knob_sz_08.png \
-img/knob_sz_10.png \
-img/knob_sz_12.png \
-img/knob_sz_14.png \
-img/knob_sz_16.png \
-img/knob_sz_18.png \
-img/knob_sz_20.png \
-img/knob_sz_22.png \
-img/knob_sz_24.png \
-img/led_dark.png \
-img/led_dot_white.png \
-img/led_light.png \
-img/led_red_light.png \
-img/led_square_base.png \
-img/led_square_glow.png \
-img/led_square_shading.png \
-img/led_square_shadow.png \
-img/led_square_shine.png \
-img/led_strobe.png \
-img/led_tiny_blue.png \
-img/led_tiny_green.png \
-img/led_tiny_orange.png \
-img/logo_blue_bottom.png \
-img/logo_blue_small_glow.png \
-img/logo_blue_small.png \
-img/map_circle.png \
-img/map_marker.png \
-img/map_scale.png \
-img/media_busy_progress.png \
-img/mini_blue_glow_arrow_0.png \
-img/mini_blue_glow_arrow_1.png \
-img/mini_blue_glow_arrow_2.png \
-img/mini_blue_glow_arrow_3.png \
-img/mini_box_bevel_shadow.png \
-img/mini_box_glow.png \
-img/music_control_icon.png \
-img/outline_glow.png \
-img/packagekit_base.png \
-img/pointer_entry_bar.png \
-img/pointer_glow.png \
-img/pointer_mono.png \
-img/pointer.png \
-img/pointer_hand1.png \
-img/ring_shadow.png \
-img/ring_white_blue_glow.png \
-img/ring_white_middle.png \
-img/rounded_square.png \
-img/runner_glow_horiz.png \
-img/runner_glow_vert.png \
-img/runner_horiz.png \
-img/runner_vert.png \
-img/screen_base.png \
-img/screen_bg.png \
-img/screen_circular_shadow.png \
-img/screen_fg.png \
-img/separator_horiz.png \
-img/shadow_angled_in_light.png \
-img/shadow_angled_in_sides.png \
-img/shadow_horiz.png \
-img/shadow_inset_bevels.png \
-img/shadow_inset_light.png \
-img/shadow_rounded_horiz.png \
-img/shadow_rounded_vert.png \
-img/shadow_square_tiny.png \
-img/shadow_vertical_dark.png \
-img/shadow_vert.png \
-img/shine.png \
-img/slider_run_base_horiz.png \
-img/slider_run_base_light_horiz.png \
-img/slider_run_base_light_vert.png \
-img/slider_run_base_vert.png \
-img/slider_run_bevel_horiz.png \
-img/slider_run_bevel_vert.png \
-img/slot_horiz_bottom.png \
-img/slot_horiz_top.png \
-img/spanner_glow.png \
-img/spanner_hilight.png \
-img/spanner_inset.png \
-img/speaker.png \
-img/split_h_glow.png \
-img/split_h_hilight.png \
-img/split_h_inset.png \
-img/split_none_glow.png \
-img/split_none_hilight.png \
-img/split_none_inset.png \
-img/split_v_glow.png \
-img/split_v_hilight.png \
-img/split_v_inset.png \
-img/sym_check_alum.png \
-img/sym_close_dark_normal.png \
-img/sym_close_dark_selected.png \
-img/sym_close_light_normal.png \
-img/sym_close_light_selected.png \
-img/sym_down_dark_normal.png \
-img/sym_down_dark_selected.png \
-img/sym_down_glow_normal.png \
-img/sym_down_light_normal.png \
-img/sym_down_light_selected.png \
-img/sym_heart_glow_normal.png \
-img/sym_heart_light_normal.png \
-img/sym_icon_op_ask.png \
-img/sym_icon_op_copy.png \
-img/sym_icon_op_move.png \
-img/sym_left_dark_normal.png \
-img/sym_left_glow_normal.png \
-img/sym_left_light_normal.png \
-img/sym_radio_alum.png \
-img/sym_reload_glow_normal.png \
-img/sym_reload_light_normal.png \
-img/sym_right_dark_normal.png \
-img/sym_right_glow_normal.png \
-img/sym_right_light_normal.png \
-img/sym_up_dark_normal.png \
-img/sym_up_dark_selected.png \
-img/sym_up_glow_normal.png \
-img/sym_up_light_normal.png \
-img/sym_up_light_selected.png \
-img/tacho_base.png \
-img/tacho_hand_big2.png \
-img/tacho_hand_big3.png \
-img/tacho_hand_big4.png \
-img/tacho_hand_big.png \
-img/tacho_hand_big_shadow.png \
-img/tacho_hand_small_min2.png \
-img/tacho_hand_small_min3.png \
-img/tacho_hand_small_min4.png \
-img/tacho_hand_small_min.png \
-img/tacho_hand_small_shadow.png \
-img/therm_content.png \
-img/therm_shadow.png \
-img/therm_shine.png \
-img/tooltip-base.png \
-img/tooltip-corner-bottom-left-tip.png \
-img/tooltip-corner-bottom-right-tip.png \
-img/tooltip-corner-top-left-tip.png \
-img/tooltip-corner-top-right-tip.png \
-img/tooltip-edge-bottom-tip.png \
-img/tooltip-edge-left-tip.png \
-img/tooltip-edge-right-tip.png \
-img/tooltip-edge-top-tip.png \
-img/vert_bar_inset.png \
-img/vert_glow_run.png \
-img/vert_glow_run_rev.png \
-img/vertical_separated_bar_glow.png \
-img/vgrad_med_curved.png \
-img/vgrad_med_darker.png \
-img/vgrad_med_dark.png \
-img/vgrad_med_dark_sparkle.png \
-img/vgrad_med_lighter.png \
-img/vgrad_med_lighter_sparkle.png \
-img/vgrad_med.png \
-img/vgrad_shadow_bi.png \
-img/vgrad_tall.png \
-img/white_bar_vert_glow.png \
-img/wifi_base.png \
-img/wifi_sig_1.png \
-img/wifi_sig_2.png \
-img/wifi_sig_3.png \
-img/win_glow.png \
-img/win_shadow.png
+images =
diff --git a/data/themes/default/colorclasses.edc b/data/themes/default/colorclasses.edc
index dd25abb..fe1af86 100644
--- a/data/themes/default/colorclasses.edc
+++ b/data/themes/default/colorclasses.edc
@@ -1,6 +1,12 @@
 #define WIN_DEFAULT_BASIC 255 255 255 255
+#define WIN_COL_HIGHLIGHT 14 169 226 255
 
 color_classes {
+	color_class {
+		name: "seperator";
+		color: WIN_COL_HIGHLIGHT;
+	}
+
 // comp
    color_class { name: "comp_focus-out_color";
       color: 255 255 255 255;
diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc
index cad9806..c252840 100644
--- a/data/themes/default/default.edc
+++ b/data/themes/default/default.edc
@@ -12,61 +12,61 @@ collections {
 
 // elm
 #include "edc/elm/bg.edc"
-#include "edc/elm/button.edc"
+//#include "edc/elm/button.edc"
 // XXX: mobile mode needs invisible scrollers... make signals that do this
-#include "edc/elm/scroller.edc"
+//#include "edc/elm/scroller.edc"
 // XXX: mobile mode needs different entry setup
-#include "edc/elm/entry.edc"
-#include "edc/elm/frame.edc"
-#include "edc/elm/label.edc"
+//#include "edc/elm/entry.edc"
+//#include "edc/elm/frame.edc"
+//#include "edc/elm/label.edc"
 #include "edc/elm/separator.edc"
-#include "edc/elm/check.edc"
-#include "edc/elm/slider.edc"
-#include "edc/elm/radio.edc"
-#include "edc/elm/bubble.edc"
-#include "edc/elm/panes.edc"
-#include "edc/elm/toolbar.edc"
-#include "edc/elm/genlist.edc"
-#include "edc/elm/list.edc"
-#include "edc/elm/conform.edc"
-#include "edc/elm/icon.edc"
-#include "edc/elm/video.edc"
-#include "edc/elm/access.edc"
-#include "edc/elm/photo.edc"
-#include "edc/elm/focus.edc"
-#include "edc/elm/datetime.edc"
-#include "edc/elm/player.edc"
-#include "edc/elm/thumb.edc"
-#include "edc/elm/pointer.edc"
-#include "edc/elm/fileselector.edc"
-#include "edc/elm/win.edc"
-#include "edc/elm/inwin.edc"
-#include "edc/elm/slideshow.edc"
-#include "edc/elm/diskselector.edc"
-#include "edc/elm/ctxpopup.edc"
-#include "edc/elm/multibuttonentry.edc"
-#include "edc/elm/dayselector.edc"
-#include "edc/elm/actionslider.edc"
-#include "edc/elm/photocam.edc"
-#include "edc/elm/tooltip.edc"
-#include "edc/elm/colorsel.edc"
-#include "edc/elm/segment_control.edc"
-#include "edc/elm/flipselector.edc"
-#include "edc/elm/notify.edc"
-#include "edc/elm/map.edc"
-#include "edc/elm/index.edc"
-#include "edc/elm/calendar.edc"
-#include "edc/elm/layout.edc"
-#include "edc/elm/progress.edc"
-#include "edc/elm/naviframe.edc"
-#include "edc/elm/panel.edc"
-#include "edc/elm/popup.edc"
-#include "edc/elm/border.edc"
+//#include "edc/elm/check.edc"
+//#include "edc/elm/slider.edc"
+//#include "edc/elm/radio.edc"
+//#include "edc/elm/bubble.edc"
+//#include "edc/elm/panes.edc"
+//#include "edc/elm/toolbar.edc"
+//#include "edc/elm/genlist.edc"
+//#include "edc/elm/list.edc"
+//#include "edc/elm/conform.edc"
+//#include "edc/elm/icon.edc"
+//#include "edc/elm/video.edc"
+//#include "edc/elm/access.edc"
+//#include "edc/elm/photo.edc"
+//#include "edc/elm/focus.edc"
+//#include "edc/elm/datetime.edc"
+//#include "edc/elm/player.edc"
+//#include "edc/elm/thumb.edc"
+//#include "edc/elm/pointer.edc"
+//#include "edc/elm/fileselector.edc"
+//#include "edc/elm/win.edc"
+//#include "edc/elm/inwin.edc"
+//#include "edc/elm/slideshow.edc"
+//#include "edc/elm/diskselector.edc"
+//#include "edc/elm/ctxpopup.edc"
+//#include "edc/elm/multibuttonentry.edc"
+//#include "edc/elm/dayselector.edc"
+//#include "edc/elm/actionslider.edc"
+//#include "edc/elm/photocam.edc"
+//#include "edc/elm/tooltip.edc"
+//#include "edc/elm/colorsel.edc"
+//#include "edc/elm/segment_control.edc"
+//#include "edc/elm/flipselector.edc"
+//#include "edc/elm/notify.edc"
+//#include "edc/elm/map.edc"
+//#include "edc/elm/index.edc"
+//#include "edc/elm/calendar.edc"
+//#include "edc/elm/layout.edc"
+//#include "edc/elm/progress.edc"
+//#include "edc/elm/naviframe.edc"
+//#include "edc/elm/panel.edc"
+//#include "edc/elm/popup.edc"
+//#include "edc/elm/border.edc"
 // XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
-#include "edc/elm/spinner.edc"
-#include "edc/elm/menu.edc"
-#include "edc/elm/clock.edc"
-#include "edc/elm/gengrid.edc"
-#include "edc/elm/hover.edc"
-#include "edc/elm/cursor.edc"
+//#include "edc/elm/spinner.edc"
+//#include "edc/elm/menu.edc"
+//#include "edc/elm/clock.edc"
+//#include "edc/elm/gengrid.edc"
+//#include "edc/elm/hover.edc"
+//#include "edc/elm/cursor.edc"
 }
diff --git a/data/themes/default/edc/elm/bg.edc b/data/themes/default/edc/elm/bg.edc
index 2a0edc3..ed3fabb 100644
--- a/data/themes/default/edc/elm/bg.edc
+++ b/data/themes/default/edc/elm/bg.edc
@@ -6,34 +6,25 @@
       elm.swallow.content: Used for elm_layout_part_content_set(bg, "overlay", content).
 */
 
-group { name: "elm/bg/base/default";
-   images.image: "bevel_dark_out.png" COMP;
-   parts {
-      part { name: "base"; type: RECT;
-         description { state: "default" 0.0;
-            color_class: "dialog_base";
-            color: 64 64 64 255;
-         }
-      }
-      part { name: "elm.swallow.rectangle"; type: SWALLOW;
-         description { state: "default" 0.0;
-         }
-      }
-      part { name: "elm.swallow.background"; type: SWALLOW;
-         description { state: "default" 0.0;
-         }
-      }
-      part { name: "bevel";
-         description { state: "default" 0.0;
-            image.normal: "bevel_dark_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "elm.swallow.content"; type: SWALLOW;
-         description { state: "default" 0.0;
-         }
-      }
-   }
+group {name: "elm/bg/base/default";
+	parts {
+		part {name: "base"; type: RECT;
+			description {state: "default" 0.0;
+				color_class: "dialog_base";
+				color: 0 0 0 255;
+			}
+		}
+		part {name: "elm.swallow.rectangle"; type: SWALLOW;
+			description {state: "default" 0.0;
+			}
+		}
+		part {name: "elm.swallow.background"; type: SWALLOW;
+			description {state: "default" 0.0;
+			}
+		}
+		part {name: "elm.swallow.content"; type: SWALLOW;
+			description {state: "default" 0.0;
+			}
+		}
+	}
 }
diff --git a/data/themes/default/edc/elm/separator.edc b/data/themes/default/edc/elm/separator.edc
index a61d978..71d2b48 100644
--- a/data/themes/default/edc/elm/separator.edc
+++ b/data/themes/default/edc/elm/separator.edc
@@ -1,27 +1,23 @@
-group { name: "elm/separator/horizontal/default";
-   images.image: "bevel_dark_in.png" COMP;
-   parts {
-      part { name: "base";
-         description { state: "default" 0.0;
-            min: 2 2;
-            max: 99999 2;
-            rel1.offset: 4 4;
-            rel2.offset: -5 -5;
-            image.normal: "bevel_dark_in.png";
-            image.border: 2 2 2 2;
-            fill.smooth: 0;
-         }
-      }
-   }
+group {name: "elm/separator/horizontal/default";
+	parts {
+		part {name: "base"; type: RECT;
+			description {state: "default" 0.0;
+				min: 1 1;
+				max: 99999 1;
+				color_class: "seperator";
+				rel1.offset: 2 2;
+				rel2.offset: -2 -2;
+			}
+		}
+	}
 }
-group { name: "elm/separator/vertical/default";
-   inherit: "elm/separator/horizontal/default";
-   parts {
-      part { name: "base";
-         description { state: "default" 0.0;
-            max: 2 99999;
-         }
-      }
-   }
+group {name: "elm/separator/vertical/default";
+	inherit: "elm/separator/horizontal/default";
+	parts {
+		part {name: "base";
+			description {state: "default" 0.0;
+				max: 1 99999;
+			}
+		}
+	}
 }
-   
-- 
cgit v0.12