Changed some ifs and adapted colors for the theme