diff --git a/core b/core
index 6d2b884..9e6e960 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 6d2b8844900d51d94fdc8cf6e946ffa7ddd464e4
+Subproject commit 9e6e960796bd66bc050f2d111ecdab6c309a0874
diff --git a/drawing/Common.lua b/drawing/Common.lua
index a1f8e77..f5aba34 100644
--- a/drawing/Common.lua
+++ b/drawing/Common.lua
@@ -31,15 +31,15 @@ M.label_font_spec = M.make_font_spec(_G_Patterns_.FONT, 8, false)
 M.left_text_style = _G_Widget_.text_style(
    M.normal_font_spec,
    _G_Patterns_.INACTIVE_TEXT_FG,
-   _G_Widget_.X_ALIGN.LEFT,
-   _G_Widget_.Y_ALIGN.CENTER
+   'left',
+   'center'
 )
 
 M.right_text_style = _G_Widget_.text_style(
    M.normal_font_spec,
    _G_Patterns_.PRIMARY_FG,
-   _G_Widget_.X_ALIGN.RIGHT,
-   _G_Widget_.Y_ALIGN.CENTER
+   'right',
+   'center'
 )
 
 local _bare_text = function(pt, text, style)
@@ -69,8 +69,8 @@ M.Header = function(x, y, w, s)
          _G_Widget_.text_style(
             M.make_font_spec(_G_Patterns_.FONT, HEADER_FONT_SIZE, true),
             _G_Patterns_.HEADER_FG,
-            _G_Widget_.X_ALIGN.LEFT,
-            _G_Widget_.Y_ALIGN.TOP
+            'left',
+            'top'
          )
       ),
       bottom_y = bottom_y,
@@ -238,8 +238,8 @@ M.initTextRing = function(x, y, r, fmt, limit)
          _G_Widget_.text_style(
             M.normal_font_spec,
             _G_Patterns_.PRIMARY_FG,
-            _G_Widget_.X_ALIGN.MIDDLE,
-            _G_Widget_.Y_ALIGN.CENTER
+            'center',
+            'center'
          ),
          fmt,
          _G_Widget_.threshold_text_style(
@@ -321,8 +321,8 @@ M.initTextRowCrit = function(x, y, w, label, append_end, limit)
          _G_Widget_.text_style(
             M.normal_font_spec,
             _G_Patterns_.PRIMARY_FG,
-            _G_Widget_.X_ALIGN.RIGHT,
-            _G_Widget_.Y_ALIGN.CENTER
+            'right',
+            'center'
          ),
             append_end,
          _G_Widget_.threshold_text_style(
diff --git a/drawing/FileSystem.lua b/drawing/FileSystem.lua
index 1de5126..ceee143 100644
--- a/drawing/FileSystem.lua
+++ b/drawing/FileSystem.lua
@@ -75,8 +75,8 @@ local labels = _G_Widget_.TextColumn(
    _G_Widget_.text_style(
       Common.normal_font_spec,
       _G_Patterns_.INACTIVE_TEXT_FG,
-      _G_Widget_.X_ALIGN.LEFT,
-      _G_Widget_.Y_ALIGN.CENTER
+      'left',
+      'center'
    ),
    nil,
    _SPACING_
diff --git a/drawing/Memory.lua b/drawing/Memory.lua
index cc80277..62d991b 100644
--- a/drawing/Memory.lua
+++ b/drawing/Memory.lua
@@ -106,8 +106,8 @@ local cache = {
       _G_Widget_.text_style(
          Common.normal_font_spec,
          _G_Patterns_.INACTIVE_TEXT_FG,
-         _G_Widget_.X_ALIGN.LEFT,
-         _G_Widget_.Y_ALIGN.CENTER
+         'left',
+         'center'
       ),
       nil,
       _TEXT_SPACING_
@@ -121,8 +121,8 @@ local cache = {
       _G_Widget_.text_style(
          Common.normal_font_spec,
          _G_Patterns_.SECONDARY_FG,
-         _G_Widget_.X_ALIGN.RIGHT,
-         _G_Widget_.Y_ALIGN.CENTER
+         'right',
+         'center'
       ),
       '%s%%',
       _TEXT_SPACING_