Themes update, two themes ported from previous version