Fixed old theme issues