reverted sublight pattern to custom syntax