Added new themes + modifications