Fixed bug
Added theme classes