Added NAS-LOCK mode
Added independent support for shift mode and shift modifier