Light theme, fix save