Made theme selection U.I smoother