Remove the code from theme.lua, make modules for it