Updated rules and watchl4d layout