diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index b408a4c..dedf758 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -10,26 +10,27 @@ ui_tab_cpu_add(Ui *ui)
    parent = ui->content;
 
    ui->cpu_view = box = elm_box_add(parent);
-   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
+   evas_object_size_hint_align_set(box, FILL, FILL);
    elm_table_pack(ui->content, ui->cpu_view, 0, 1, 1, 1);
    evas_object_hide(box);
 
    ui->cpu_activity = hbox = elm_box_add(box);
-   evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0);
-   evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(hbox, EXPAND, 0);
+   evas_object_size_hint_align_set(hbox, FILL, FILL);
    evas_object_show(hbox);
 
    frame = elm_frame_add(box);
-   evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
+   evas_object_size_hint_align_set(frame, FILL, FILL);
    elm_object_style_set(frame, "pad_small");
    evas_object_show(frame);
 
    scroller = elm_scroller_add(parent);
-   evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
+   evas_object_size_hint_weight_set(scroller, EXPAND, EXPAND);
+   evas_object_size_hint_align_set(scroller, FILL, FILL);
+   elm_scroller_policy_set(scroller,
+                   ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
    evas_object_show(scroller);
    elm_object_content_set(scroller, hbox);
 
@@ -37,8 +38,8 @@ ui_tab_cpu_add(Ui *ui)
    elm_box_pack_end(box, frame);
 
    box = elm_box_add(ui->content);
-   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(box, FILL, FILL);
+   evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
    evas_object_show(box);
 
    cpu_count = system_cpu_online_count_get();
@@ -48,35 +49,37 @@ ui_tab_cpu_add(Ui *ui)
         if (i == 0)
           {
              frame = elm_frame_add(box);
-             evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0);
-             evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+             evas_object_size_hint_align_set(frame, FILL, 0);
+             evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
              evas_object_show(frame);
              elm_object_style_set(frame, "pad_large");
              elm_box_pack_end(box, frame);
 
              label = elm_label_add(box);
-             evas_object_size_hint_align_set(label, EVAS_HINT_FILL, 0);
-             evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-             elm_object_text_set(label, eina_slstr_printf(_("<subtitle>CPUs</subtitle><br><bigger>Total of %d CPUs</bigger>"), cpu_count));
+             evas_object_size_hint_align_set(label, FILL, 0);
+             evas_object_size_hint_weight_set(label, EXPAND, EXPAND);
+             elm_object_text_set(label,
+                        eina_slstr_printf(_("<subtitle>CPUs</subtitle><br>"
+                        "<bigger>Total of %d CPUs</bigger>"), cpu_count));
              evas_object_show(label);
              elm_box_pack_end(box, label);
 
              ui->temp_label = label = elm_label_add(box);
-             evas_object_size_hint_align_set(label, EVAS_HINT_FILL, 0);
-             evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+             evas_object_size_hint_align_set(label, FILL, 0);
+             evas_object_size_hint_weight_set(label, EXPAND, EXPAND);
              evas_object_show(label);
              elm_box_pack_end(box, label);
           }
 
         frame = elm_frame_add(box);
-        evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0);
-        evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+        evas_object_size_hint_align_set(frame, FILL, 0);
+        evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
         evas_object_show(frame);
         elm_object_style_set(frame, "pad_large");
 
         progress = elm_progressbar_add(frame);
-        evas_object_size_hint_align_set(progress, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        evas_object_size_hint_weight_set(progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+        evas_object_size_hint_align_set(progress, FILL, FILL);
+        evas_object_size_hint_weight_set(progress, EXPAND, EXPAND);
         elm_progressbar_span_size_set(progress, 1.0);
         elm_progressbar_unit_format_set(progress, "%1.2f%%");
         evas_object_show(progress);
@@ -102,7 +105,9 @@ ui_tab_cpu_update(Ui *ui, Sys_Info *sysinfo)
      return;
 
    if (sysinfo->temperature != INVALID_TEMP)
-     elm_object_text_set(ui->temp_label, eina_slstr_printf(_("Core at (%d °C)"), sysinfo->temperature));
+     elm_object_text_set(ui->temp_label,
+                    eina_slstr_printf(_("Core at (%d °C)"),
+                    sysinfo->temperature));
 
    EINA_LIST_FOREACH(ui->cpu_list, l, pb)
      {