task #00018-Theme_lines_type: MInor fix
Merge branch '00018-Theme_lines_type' into develop