Added lightswitch macros