Fixed spec
Removed unused themes