cleaned up theme.lua some more