Fixed some theme problems