[*] MO : standard coding + bug 1.6 themes

Standard coding fix
Bug fix OPC 1.6 themes