refactored selfie and watermark to one step
moved some hardcoding to conf, merger selfie and wmark to one step