Fix layouts as dependencies for templates