diff --git a/core b/core
index 9a9a86c..fe7f073 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 9a9a86cdacf0cbbcc37eb2db908ec4ade78d3e99
+Subproject commit fe7f073acd35fea54ecba747dd6d0bff708143a0
diff --git a/drawing/Common.lua b/drawing/Common.lua
index 22bf110..758c00f 100644
--- a/drawing/Common.lua
+++ b/drawing/Common.lua
@@ -44,8 +44,7 @@ M.right_text_style = _G_Widget_.text_style(
 )
 
 local _bare_text = function(pt, text, style)
-   local fmt = _G_Widget_.text_format(false, false)
-   return _G_Widget_.Text(pt, text, style, fmt)
+   return _G_Widget_.plainText(pt, text, style)
 end
 
 local _left_text = function(pt, text)
@@ -77,7 +76,7 @@ M.Header = function(x, y, w, s)
       --    -- slant 		= HEADER_FONT_SLANT,
       --    -- weight 	= HEADER_FONT_WEIGHT
       -- },
-      text = _G_Widget_.Text(
+      text = _G_Widget_.plainText(
          _G_Widget_.make_point(x, y),
          s,
          _G_Widget_.text_style(
@@ -85,8 +84,7 @@ M.Header = function(x, y, w, s)
             _G_Patterns_.HEADER_FG,
             'left',
             'top'
-         ),
-         _G_Widget_.text_format(false, false)
+         )
       ),
       bottom_y = bottom_y,
       -- underline = _G_Widget_.Line{