More themes better code

Added 5 more themes and the code is optimized.