Improvments + change color in theme options