More work on themes module