Added modules and themes