Fixed theme related issues. Added 5 themes