Add less extension. Lot of general changes (order, variables...)