fixed a problem with screens, fixed jwerty dependency