theme switching seems to be done. popup needs some work.