Fixed some theme issiues