Fix bug in themes changer. Navigation improvment.