diff --git a/Resources/TaskList/TaskList8.swift b/Resources/TaskList/TaskList8.swift
index 75a2c98..2f4eb2e 100644
--- a/Resources/TaskList/TaskList8.swift
+++ b/Resources/TaskList/TaskList8.swift
@@ -15,8 +15,8 @@ struct TaskList: View {
                 ActionRow()
                     .title(task.label)
             }
-            .valign(.start)
             .boxedList()
+            .valign(.start)
             .padding()
         }
     }
diff --git a/Resources/Views/AdwaitaTemplate2.swift b/Resources/Views/AdwaitaTemplate2.swift
index 54f46ee..bf68b31 100644
--- a/Resources/Views/AdwaitaTemplate2.swift
+++ b/Resources/Views/AdwaitaTemplate2.swift
@@ -20,7 +20,7 @@ struct AdwaitaTemplate: App {
 struct Content: View {
 
     var app: AdwaitaApp
-    var window: AdwaitaApplicationWindow
+    var window: AdwaitaWindow
 
     var view: Body {
         Text(Loc.helloWorld)
diff --git a/Resources/Views/AdwaitaTemplate3.swift b/Resources/Views/AdwaitaTemplate3.swift
index b51c800..0199c33 100644
--- a/Resources/Views/AdwaitaTemplate3.swift
+++ b/Resources/Views/AdwaitaTemplate3.swift
@@ -20,7 +20,7 @@ struct AdwaitaTemplate: App {
 struct Content: View {
 
     var app: AdwaitaApp
-    var window: AdwaitaApplicationWindow
+    var window: AdwaitaWindow
 
     var view: Body {
         Button(Loc.helloWorld) {
diff --git a/Resources/Views/AdwaitaTemplate4.swift b/Resources/Views/AdwaitaTemplate4.swift
index 9b63557..9bfb4f4 100644
--- a/Resources/Views/AdwaitaTemplate4.swift
+++ b/Resources/Views/AdwaitaTemplate4.swift
@@ -21,7 +21,7 @@ struct Content: View {
 
     @State private var startAlign = false
     var app: AdwaitaApp
-    var window: AdwaitaApplicationWindow
+    var window: AdwaitaWindow
 
     var view: Body {
         Button("Toggle Start Alignment") {
diff --git a/Resources/Views/AdwaitaTemplate5.swift b/Resources/Views/AdwaitaTemplate5.swift
index 324d09d..12519d8 100644
--- a/Resources/Views/AdwaitaTemplate5.swift
+++ b/Resources/Views/AdwaitaTemplate5.swift
@@ -21,7 +21,7 @@ struct Content: View {
 
     @State private var startAlign = false
     var app: AdwaitaApp
-    var window: AdwaitaApplicationWindow
+    var window: AdwaitaWindow
 
     var view: Body {
         ButtonView(startAlign: $startAlign)