Starting to improve themes module