revert key hack && update hw key overlays