diff --git a/Acorn/appletv_icon_appstore.acorn b/Acorn/appletv_icon_appstore.acorn
new file mode 100644
index 0000000..40b605d
Binary files /dev/null and b/Acorn/appletv_icon_appstore.acorn differ
diff --git a/Acorn/appletv_icon_small.acorn b/Acorn/appletv_icon_small.acorn
new file mode 100644
index 0000000..e79d88a
Binary files /dev/null and b/Acorn/appletv_icon_small.acorn differ
diff --git a/Acorn/appletv_topshelf.acorn b/Acorn/appletv_topshelf.acorn
new file mode 100644
index 0000000..23f5556
Binary files /dev/null and b/Acorn/appletv_topshelf.acorn differ
diff --git a/Acorn/appletv_topshelf_wide.acorn b/Acorn/appletv_topshelf_wide.acorn
new file mode 100644
index 0000000..d7e35ec
Binary files /dev/null and b/Acorn/appletv_topshelf_wide.acorn differ
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
similarity index 67%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
index 2e00335..789e910 100644
--- a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json	
+++ b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json	
@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "appletv_icon_appstore_back@2x.png",
       "idiom" : "tv"
     }
   ],
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/appletv_icon_appstore_back@2x.png b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/appletv_icon_appstore_back@2x.png
new file mode 100644
index 0000000..e8945aa
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/appletv_icon_appstore_back@2x.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json
new file mode 100644
index 0000000..341a55f
--- /dev/null
+++ b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "frame-size" : {
+      "height" : 768,
+      "width" : 1280
+    }
+  }
+}
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Contents.json
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
similarity index 67%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
index 2e00335..7dc7eae 100644
--- a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json	
+++ b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json	
@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "appletv_icon_appstore_front@2x.png",
       "idiom" : "tv"
     }
   ],
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/appletv_icon_appstore_front@2x.png b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/appletv_icon_appstore_front@2x.png
new file mode 100644
index 0000000..5ce334d
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/appletv_icon_appstore_front@2x.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json
new file mode 100644
index 0000000..341a55f
--- /dev/null
+++ b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "frame-size" : {
+      "height" : 768,
+      "width" : 1280
+    }
+  }
+}
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
similarity index 78%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
index 795cce1..bcd5f06 100644
--- a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json	
+++ b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json	
@@ -5,6 +5,7 @@
       "scale" : "1x"
     },
     {
+      "filename" : "appletv_icon_small_back@2x.png",
       "idiom" : "tv",
       "scale" : "2x"
     }
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/appletv_icon_small_back@2x.png b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/appletv_icon_small_back@2x.png
new file mode 100644
index 0000000..d5e173c
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/appletv_icon_small_back@2x.png differ
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Contents.json
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
new file mode 100644
index 0000000..3b67ef6
--- /dev/null
+++ b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json	
@@ -0,0 +1,17 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "appletv_icon_small_front@2x.png",
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/appletv_icon_small_front@2x.png b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/appletv_icon_small_front@2x.png
new file mode 100644
index 0000000..081598f
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/appletv_icon_small_front@2x.png differ
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/Contents.json
similarity index 100%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/Contents.json
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image Wide.imageset/Contents.json
similarity index 79%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image Wide.imageset/Contents.json
index 795cce1..1aba501 100644
--- a/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json	
+++ b/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image Wide.imageset/Contents.json	
@@ -5,6 +5,7 @@
       "scale" : "1x"
     },
     {
+      "filename" : "appletv_topshelf_wide@2x.png",
       "idiom" : "tv",
       "scale" : "2x"
     }
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image Wide.imageset/appletv_topshelf_wide@2x.png b/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image Wide.imageset/appletv_topshelf_wide@2x.png
new file mode 100644
index 0000000..9afd9ce
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image Wide.imageset/appletv_topshelf_wide@2x.png differ
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image.imageset/Contents.json
similarity index 80%
rename from AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
rename to AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image.imageset/Contents.json
index 795cce1..aadae2d 100644
--- a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json	
+++ b/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image.imageset/Contents.json	
@@ -5,6 +5,7 @@
       "scale" : "1x"
     },
     {
+      "filename" : "appletv_topshelf@2x.png",
       "idiom" : "tv",
       "scale" : "2x"
     }
diff --git a/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image.imageset/appletv_topshelf@2x.png b/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image.imageset/appletv_topshelf@2x.png
new file mode 100644
index 0000000..533b6ce
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.brandassets/Top Shelf Image.imageset/appletv_topshelf@2x.png differ
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json
deleted file mode 100644
index 73c0059..0000000
--- a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json	
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json
deleted file mode 100644
index 73c0059..0000000
--- a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json	
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json
deleted file mode 100644
index 795cce1..0000000
--- a/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json	
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "tv",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "tv",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}