Fixes, added another theme
Fixes