Add more Modules and themes