Updated logic, added array of themes