Improve some theme stuff to bring more performance to scss edition.