[uonvars] more module theme corrections