themes module behaviour fix