revert key hack and update hw key overlay