Bring the lockscreen and the image viewer under the generator
Ship the Akari Night skeleton and pick it at session start
Generate the desktop skeleton from the theme instead of transcribing it