partially moved to events architecture, added  keyboard no-fade