Reworked gears and lighting