Add real support for "Screens" (app modules)