diff --git a/graphics/elements/button_push.lua b/graphics/elements/button_push.lua
index e81740a..a51e8f3 100644
--- a/graphics/elements/button_push.lua
+++ b/graphics/elements/button_push.lua
@@ -29,9 +29,11 @@ local function push_button(args)
 
     -- write the button text
     e.window.setCursorPos(h_pad, v_pad)
-    e.write(args.text)
+    e.window.write(args.text)
 
     -- handle touch
+    ---@param event monitor_touch monitor touch event
+---@diagnostic disable-next-line: unused-local
     function e.handle_touch(event)
         if args.active_fg_bg ~= nil then
             -- show as pressed
diff --git a/graphics/elements/button_switch.lua b/graphics/elements/button_switch.lua
index 6c14483..c17e553 100644
--- a/graphics/elements/button_switch.lua
+++ b/graphics/elements/button_switch.lua
@@ -32,7 +32,7 @@ local function switch_button(args)
 
     -- write the button text
     e.window.setCursorPos(h_pad, v_pad)
-    e.write(args.text)
+    e.window.write(args.text)
 
     -- show the button state
     local function draw_state()
@@ -53,6 +53,8 @@ local function switch_button(args)
     draw_state()
 
     -- handle touch
+    ---@param event monitor_touch monitor touch event
+---@diagnostic disable-next-line: unused-local
     function e.handle_touch(event)
         -- toggle state
         state = not state
diff --git a/graphics/elements/indicator_data.lua b/graphics/elements/indicator_data.lua
index a9677c5..4f0655a 100644
--- a/graphics/elements/indicator_data.lua
+++ b/graphics/elements/indicator_data.lua
@@ -24,7 +24,7 @@ local function data_indicator(args)
 
     -- label color
     if args.label_unit_colors ~= nil then
-        e.window.setForegroundColor(args.label_unit_colors.color_a)
+        e.window.setTextColor(args.label_unit_colors.color_a)
     end
 
     -- write label
@@ -40,13 +40,13 @@ local function data_indicator(args)
 
         -- write data
         e.window.setCursorPos(data_start, 1)
-        e.window.setForegroundColor(e.fg_bg.fgd)
+        e.window.setTextColor(e.fg_bg.fgd)
         e.window.write(data_str)
 
         -- write label
         if args.unit ~= nil then
             if args.label_unit_colors ~= nil then
-                e.window.setForegroundColor(args.label_unit_colors.color_b)
+                e.window.setTextColor(args.label_unit_colors.color_b)
             end
             e.window.write(" " .. args.unit)
         end