* Added Temas
* Minor Fixes