Fix for shiftlight, changes for mapswitch