Fix country, add more themes, move quit button