More themes changes