diff --git a/core b/core
index b9c3881..3fff6b0 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit b9c3881e2aaf27bc30c60580bf162ce25a929a4f
+Subproject commit 3fff6b06be21330a2b42c61c273ea2bd9bf782b0
diff --git a/drawing/Common.lua b/drawing/Common.lua
index 578b5fc..18bccfb 100644
--- a/drawing/Common.lua
+++ b/drawing/Common.lua
@@ -4,6 +4,8 @@ local Util = require 'Util'
 local Theme = require 'Patterns'
 local Startup = require 'Widget'
 local Dial = require 'Dial'
+local Rect = require 'Rect'
+local FillRect = require 'FillRect'
 local CompoundDial = require 'CompoundDial'
 local Arc = require 'Arc'
 local Text = require 'Text'
@@ -553,7 +555,7 @@ end
 M.default_table_font_spec = M.make_font_spec(FONT, TABLE_FONT_SIZE, false)
 
 M.default_table_style = Startup.table_style(
-   Startup.rect_style(
+   Rect.style(
       TABLE_LINE_THICKNESS,
       Theme.BORDER_FG
    ),
@@ -593,9 +595,9 @@ end
 -- panel
 
 M.initPanel = function(x, y, w, h, thickness)
-   return Startup.FillRect(
+   return FillRect.build(
       Startup.make_box(x, y, w, h),
-      Startup.rect_style(thickness, Theme.BORDER_FG),
+      Rect.style(thickness, Theme.BORDER_FG),
       Theme.PANEL_BG
    )
 end