Only hide the wait screen when a new screen is shown, not when stopping a module.
Use the black theme for "Is this your computer"
Remove the commented out line.