Move some stuff around
Remove old themes, choice is now dark or light
Remove old themes, choice is now dark or light