diff --git a/core b/core
index fe14fdc..74aa89b 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit fe14fdce991242f892d4e47651c47d30687a9b52
+Subproject commit 74aa89b9f069b46559b8652d7627dfc4b34efd58
diff --git a/drawing/Common.lua b/drawing/Common.lua
index 38dca28..6f79256 100644
--- a/drawing/Common.lua
+++ b/drawing/Common.lua
@@ -81,11 +81,11 @@ M.Header = function(x, y, w, s)
       --    cap 			= HEADER_UNDERLINE_CAP
       -- }
       underline = _G_Widget_.Line(
+         {x = x, y = underline_y},
+         {x = x + w, y = underline_y},
          HEADER_UNDERLINE_THICKNESS,
          HEADER_UNDERLINE_CAP,
-         _G_Patterns_.HEADER_FG,
-         {x = x, y = underline_y},
-         {x = x + w, y = underline_y}
+         _G_Patterns_.HEADER_FG
       )
    }
 
@@ -257,8 +257,10 @@ M.initRing = function(x, y, r)
          0,
          360
       ),
-      2,
-      _G_Patterns_.BORDER_FG
+      _G_Widget_.arc_style(
+         2,
+         _G_Patterns_.BORDER_FG
+      )
    )
 end
 
@@ -316,11 +318,11 @@ M.initSeparator = function(x, y, w)
    --    line_pattern = _G_Patterns_.BORDER_FG,
    -- }
    return _G_Widget_.Line(
+      {x = x, y = y},
+      {x = x + w, y = y},
       1,
       CAIRO_LINE_CAP_BUTT,
-      _G_Patterns_.BORDER_FG,
-      {x = x, y = y},
-      {x = x + w, y = y}
+      _G_Patterns_.BORDER_FG
    )
 end
 
diff --git a/drawing/Memory.lua b/drawing/Memory.lua
index c3e04f1..840d338 100644
--- a/drawing/Memory.lua
+++ b/drawing/Memory.lua
@@ -61,8 +61,10 @@ local dial = _G_Widget_.Dial(
       90,
       360
    ),
-   _DIAL_THICKNESS_,
-   _G_Patterns_.INDICATOR_BG,
+   _G_Widget_.arc_style(
+      _DIAL_THICKNESS_,
+      _G_Patterns_.INDICATOR_BG
+   ),
    _G_Patterns_.INDICATOR_FG_PRIMARY,
    _G_Patterns_.INDICATOR_FG_CRITICAL,
    0.8
@@ -74,8 +76,10 @@ local cache_arc = _G_Widget_.Arc(
       90,
       360
    ),
-   _DIAL_THICKNESS_,
-   _G_Patterns_.INDICATOR_FG_SECONDARY
+   _G_Widget_.arc_style(
+      _DIAL_THICKNESS_,
+      _G_Patterns_.INDICATOR_FG_SECONDARY
+   )
 )
 
 local text_ring = Common.initTextRing(