task #00018-Theme_lines_type: Features update
Merge branch '00018-Theme_lines_type' into develop