Fixes in lighting schema (Issue #119)