diff --git a/sys/modules/opus/ui.lua b/sys/modules/opus/ui.lua
index 50864c7..5f2245e 100644
--- a/sys/modules/opus/ui.lua
+++ b/sys/modules/opus/ui.lua
@@ -1217,6 +1217,8 @@ end
 
 loadComponents()
 UI:loadTheme('usr/config/ui.theme')
+Util.merge(UI.Window.defaults, UI.theme.Window)
+Util.merge(UI.Page.defaults, UI.theme.Page)
 UI:setDefaultDevice(UI.Device({ device = term.current() }))
 
 return UI