Theme update and more