fix bug + change theme