Improve lights for STM/SHD