themes : reorganize themes variables