diff --git a/experimental/varfont_shader_puzzle/.metadata b/experimental/varfont_shader_puzzle/.metadata
index 0372c0d84..f0a0035aa 100644
--- a/experimental/varfont_shader_puzzle/.metadata
+++ b/experimental/varfont_shader_puzzle/.metadata
@@ -4,8 +4,8 @@
 # This file should be version controlled.
 
 version:
-  revision: b938dc13df32cd510844863a66856dd240dc3302
-  channel: master
+  revision: 7048ed95a5ad3e43d697e0c397464193991fc230
+  channel: stable
 
 project_type: app
 
@@ -13,26 +13,23 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: b938dc13df32cd510844863a66856dd240dc3302
-      base_revision: b938dc13df32cd510844863a66856dd240dc3302
+      create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
+      base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
     - platform: android
-      create_revision: b938dc13df32cd510844863a66856dd240dc3302
-      base_revision: b938dc13df32cd510844863a66856dd240dc3302
+      create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
+      base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
     - platform: ios
-      create_revision: b938dc13df32cd510844863a66856dd240dc3302
-      base_revision: b938dc13df32cd510844863a66856dd240dc3302
+      create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
+      base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
     - platform: linux
-      create_revision: b938dc13df32cd510844863a66856dd240dc3302
-      base_revision: b938dc13df32cd510844863a66856dd240dc3302
+      create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
+      base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
     - platform: macos
-      create_revision: b938dc13df32cd510844863a66856dd240dc3302
-      base_revision: b938dc13df32cd510844863a66856dd240dc3302
-    - platform: web
-      create_revision: b938dc13df32cd510844863a66856dd240dc3302
-      base_revision: b938dc13df32cd510844863a66856dd240dc3302
+      create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
+      base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
     - platform: windows
-      create_revision: b938dc13df32cd510844863a66856dd240dc3302
-      base_revision: b938dc13df32cd510844863a66856dd240dc3302
+      create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
+      base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
 
   # User provided section
 
diff --git a/experimental/varfont_shader_puzzle/android/app/build.gradle b/experimental/varfont_shader_puzzle/android/app/build.gradle
index 54e8cae96..11b4983b9 100644
--- a/experimental/varfont_shader_puzzle/android/app/build.gradle
+++ b/experimental/varfont_shader_puzzle/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.type_jam_github"
+        applicationId "com.example.varfont_shader_puzzle"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion flutter.minSdkVersion
diff --git a/experimental/varfont_shader_puzzle/android/app/src/debug/AndroidManifest.xml b/experimental/varfont_shader_puzzle/android/app/src/debug/AndroidManifest.xml
index 4873ef591..eed7cc9b1 100644
--- a/experimental/varfont_shader_puzzle/android/app/src/debug/AndroidManifest.xml
+++ b/experimental/varfont_shader_puzzle/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.type_jam_github">
+    package="com.example.varfont_shader_puzzle">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/experimental/varfont_shader_puzzle/android/app/src/main/AndroidManifest.xml b/experimental/varfont_shader_puzzle/android/app/src/main/AndroidManifest.xml
index c5431455a..fbbfce51d 100644
--- a/experimental/varfont_shader_puzzle/android/app/src/main/AndroidManifest.xml
+++ b/experimental/varfont_shader_puzzle/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.type_jam_github">
+    package="com.example.varfont_shader_puzzle">
    <application
-        android:label="type_jam_github"
+        android:label="varfont_shader_puzzle"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/experimental/varfont_shader_puzzle/android/app/src/main/kotlin/com/example/type_jam_github/MainActivity.kt b/experimental/varfont_shader_puzzle/android/app/src/main/kotlin/com/example/varfont_shader_puzzle/MainActivity.kt
similarity index 69%
rename from experimental/varfont_shader_puzzle/android/app/src/main/kotlin/com/example/type_jam_github/MainActivity.kt
rename to experimental/varfont_shader_puzzle/android/app/src/main/kotlin/com/example/varfont_shader_puzzle/MainActivity.kt
index f79ea136e..ec859b3e1 100644
--- a/experimental/varfont_shader_puzzle/android/app/src/main/kotlin/com/example/type_jam_github/MainActivity.kt
+++ b/experimental/varfont_shader_puzzle/android/app/src/main/kotlin/com/example/varfont_shader_puzzle/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.type_jam_github
+package com.example.varfont_shader_puzzle
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/experimental/varfont_shader_puzzle/android/app/src/profile/AndroidManifest.xml b/experimental/varfont_shader_puzzle/android/app/src/profile/AndroidManifest.xml
index 4873ef591..eed7cc9b1 100644
--- a/experimental/varfont_shader_puzzle/android/app/src/profile/AndroidManifest.xml
+++ b/experimental/varfont_shader_puzzle/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.type_jam_github">
+    package="com.example.varfont_shader_puzzle">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/experimental/varfont_shader_puzzle/android/build.gradle b/experimental/varfont_shader_puzzle/android/build.gradle
index e50c3a02b..58a8c74b1 100644
--- a/experimental/varfont_shader_puzzle/android/build.gradle
+++ b/experimental/varfont_shader_puzzle/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/experimental/varfont_shader_puzzle/codelab_rebuild.yaml b/experimental/varfont_shader_puzzle/codelab_rebuild.yaml
new file mode 100644
index 000000000..237bebbae
--- /dev/null
+++ b/experimental/varfont_shader_puzzle/codelab_rebuild.yaml
@@ -0,0 +1,19 @@
+# Run with tooling from https://github.com/flutter/codelabs/tree/main/tooling/codelab_rebuild
+name: Animations rebuild script
+steps:
+  - name: Remove runners
+    rmdirs: 
+      - android
+      - ios
+      - linux
+      - macos
+      - windows
+  - name: Flutter recreate
+    flutter: create . --platforms android,ios,linux,macos,windows
+  - name: Strip DEVELOPMENT_TEAM
+    strip-lines-containing: DEVELOPMENT_TEAM =
+    path: ios/Runner.xcodeproj/project.pbxproj
+  - name: Build for iOS
+    flutter: build ios
+  - name: Build for macOS
+    flutter: build macos
diff --git a/experimental/varfont_shader_puzzle/ios/Podfile b/experimental/varfont_shader_puzzle/ios/Podfile
index fdcc671eb..88359b225 100644
--- a/experimental/varfont_shader_puzzle/ios/Podfile
+++ b/experimental/varfont_shader_puzzle/ios/Podfile
@@ -32,9 +32,6 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  target 'RunnerTests' do
-    inherit! :search_paths
-  end
 end
 
 post_install do |installer|
diff --git a/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/project.pbxproj b/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/project.pbxproj
index bef490c99..720f88c04 100644
--- a/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/project.pbxproj
+++ b/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/project.pbxproj
@@ -8,26 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		57600031B42DCD6AF63CDE0B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EC4424E400A59A8E69D1669 /* Pods_Runner.framework */; };
-		6A4FE99498803ED2C0657E40 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D52775AA04F31BB28C1528 /* Pods_RunnerTests.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		E36E33E59C6712F5CDEABED9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F8D2D5E254D0D4E20BAC0FF /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
-			remoteInfo = Runner;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXCopyFilesBuildPhase section */
 		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -42,16 +30,11 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0216F236A1CB3538AAF54499 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		16C278FB76AC8CA0A1B9F53C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
-		2DC679FDBB1D74022B3A8AAB /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
-		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
-		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		1F8D2D5E254D0D4E20BAC0FF /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		3A225E848835AC2DA306BE26 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		4538BA127B499A5077B3DB57 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		59466897B91FAC54FB78DE2C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -62,9 +45,8 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		9EC4424E400A59A8E69D1669 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		A2D52775AA04F31BB28C1528 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		C5A55D4E52A21B57E8836CE7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
+		CB238513EE6781B7EAEBD96C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		CE295227460F70AAE518F6BF /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -72,47 +54,27 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				57600031B42DCD6AF63CDE0B /* Pods_Runner.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0BE81C82F45E53ACCC734BC /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				6A4FE99498803ED2C0657E40 /* Pods_RunnerTests.framework in Frameworks */,
+				E36E33E59C6712F5CDEABED9 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		331C8082294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXGroup;
-			children = (
-				331C807B294A618700263BE5 /* RunnerTests.swift */,
-			);
-			path = RunnerTests;
-			sourceTree = "<group>";
-		};
-		5129060FE3FA8214C53D99E4 /* Frameworks */ = {
+		50678FE8212F9FCDEB5AC331 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				9EC4424E400A59A8E69D1669 /* Pods_Runner.framework */,
-				A2D52775AA04F31BB28C1528 /* Pods_RunnerTests.framework */,
+				1F8D2D5E254D0D4E20BAC0FF /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		6AB78BEFECAF31F08BD66F27 /* Pods */ = {
+		7AA8BA67C75B811D4868035C /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				4538BA127B499A5077B3DB57 /* Pods-Runner.debug.xcconfig */,
-				59466897B91FAC54FB78DE2C /* Pods-Runner.release.xcconfig */,
-				0216F236A1CB3538AAF54499 /* Pods-Runner.profile.xcconfig */,
-				16C278FB76AC8CA0A1B9F53C /* Pods-RunnerTests.debug.xcconfig */,
-				C5A55D4E52A21B57E8836CE7 /* Pods-RunnerTests.release.xcconfig */,
-				2DC679FDBB1D74022B3A8AAB /* Pods-RunnerTests.profile.xcconfig */,
+				CB238513EE6781B7EAEBD96C /* Pods-Runner.debug.xcconfig */,
+				CE295227460F70AAE518F6BF /* Pods-Runner.release.xcconfig */,
+				3A225E848835AC2DA306BE26 /* Pods-Runner.profile.xcconfig */,
 			);
 			name = Pods;
 			path = Pods;
@@ -135,9 +97,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				331C8082294A63A400263BE5 /* RunnerTests */,
-				6AB78BEFECAF31F08BD66F27 /* Pods */,
-				5129060FE3FA8214C53D99E4 /* Frameworks */,
+				7AA8BA67C75B811D4868035C /* Pods */,
+				50678FE8212F9FCDEB5AC331 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -145,7 +106,6 @@
 			isa = PBXGroup;
 			children = (
 				97C146EE1CF9000F007C117D /* Runner.app */,
-				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -168,37 +128,18 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		331C8080294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
-			buildPhases = (
-				15B3F777D583A1AB4057956A /* [CP] Check Pods Manifest.lock */,
-				331C807D294A63A400263BE5 /* Sources */,
-				331C807F294A63A400263BE5 /* Resources */,
-				D0BE81C82F45E53ACCC734BC /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				331C8086294A63A400263BE5 /* PBXTargetDependency */,
-			);
-			name = RunnerTests;
-			productName = RunnerTests;
-			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				57CD11B33734046FDAD63F9C /* [CP] Check Pods Manifest.lock */,
+				13D1767A26A4A1E1D5068A6B /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				BCE75509FAF8D589BBA11536 /* [CP] Embed Pods Frameworks */,
+				6AEC470135164D6626124A79 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -218,10 +159,6 @@
 				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
-					331C8080294A63A400263BE5 = {
-						CreatedOnToolsVersion = 14.0;
-						TestTargetID = 97C146ED1CF9000F007C117D;
-					};
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
 						LastSwiftMigration = 1100;
@@ -242,19 +179,11 @@
 			projectRoot = "";
 			targets = (
 				97C146ED1CF9000F007C117D /* Runner */,
-				331C8080294A63A400263BE5 /* RunnerTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		331C807F294A63A400263BE5 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		97C146EC1CF9000F007C117D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -269,7 +198,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		15B3F777D583A1AB4057956A /* [CP] Check Pods Manifest.lock */ = {
+		13D1767A26A4A1E1D5068A6B /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -284,7 +213,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -306,26 +235,21 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		57CD11B33734046FDAD63F9C /* [CP] Check Pods Manifest.lock */ = {
+		6AEC470135164D6626124A79 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
@@ -343,34 +267,9 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		BCE75509FAF8D589BBA11536 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		331C807D294A63A400263BE5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		97C146EA1CF9000F007C117D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -382,14 +281,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 97C146ED1CF9000F007C117D /* Runner */;
-			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -467,14 +358,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = S8QB4VV633;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.varfontShaderPuzzle;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -482,56 +372,6 @@
 			};
 			name = Profile;
 		};
-		331C8088294A63A400263BE5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 16C278FB76AC8CA0A1B9F53C /* Pods-RunnerTests.debug.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Debug;
-		};
-		331C8089294A63A400263BE5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = C5A55D4E52A21B57E8836CE7 /* Pods-RunnerTests.release.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Release;
-		};
-		331C808A294A63A400263BE5 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2DC679FDBB1D74022B3A8AAB /* Pods-RunnerTests.profile.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Profile;
-		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -646,14 +486,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = S8QB4VV633;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.varfontShaderPuzzle;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -669,14 +508,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = S8QB4VV633;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.varfontShaderPuzzle;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -687,16 +525,6 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				331C8088294A63A400263BE5 /* Debug */,
-				331C8089294A63A400263BE5 /* Release */,
-				331C808A294A63A400263BE5 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index e42adcb34..c87d15a33 100644
--- a/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/experimental/varfont_shader_puzzle/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -37,17 +37,6 @@
          </BuildableReference>
       </MacroExpansion>
       <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "331C8080294A63A400263BE5"
-               BuildableName = "RunnerTests.xctest"
-               BlueprintName = "RunnerTests"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/experimental/varfont_shader_puzzle/ios/Runner/Info.plist b/experimental/varfont_shader_puzzle/ios/Runner/Info.plist
index 6ff58b48e..ed25721cc 100644
--- a/experimental/varfont_shader_puzzle/ios/Runner/Info.plist
+++ b/experimental/varfont_shader_puzzle/ios/Runner/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Type Jam Github</string>
+	<string>Varfont Shader Puzzle</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>type_jam_github</string>
+	<string>varfont_shader_puzzle</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/experimental/varfont_shader_puzzle/ios/RunnerTests/RunnerTests.swift b/experimental/varfont_shader_puzzle/ios/RunnerTests/RunnerTests.swift
deleted file mode 100644
index 86a7c3b1b..000000000
--- a/experimental/varfont_shader_puzzle/ios/RunnerTests/RunnerTests.swift
+++ /dev/null
@@ -1,12 +0,0 @@
-import Flutter
-import UIKit
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}
diff --git a/experimental/varfont_shader_puzzle/lib/components/fragment_shaded.dart b/experimental/varfont_shader_puzzle/lib/components/fragment_shaded.dart
index 7f19f60fc..e320b5f7d 100644
--- a/experimental/varfont_shader_puzzle/lib/components/fragment_shaded.dart
+++ b/experimental/varfont_shader_puzzle/lib/components/fragment_shaded.dart
@@ -7,24 +7,30 @@ import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 
+enum Shader {
+  nothing('nothing'),
+  bwSplit('bw_split'),
+  colorSplit('color_split'),
+  rowOffset('row_offset'),
+  wavyCirc('wavy_circ'),
+  wavy('wavy'),
+  wavy2('wavy2');
+
+  const Shader(this.name);
+  final String name;
+  Future<ui.FragmentProgram> get program =>
+      ui.FragmentProgram.fromAsset('shaders/$name.frag');
+}
+
 class FragmentShaded extends StatefulWidget {
   final Widget child;
-  final String shaderName;
+  final Shader shader;
   final int shaderDuration;
   static const int dampenDuration = 1000;
-  static final Map<String, ui.FragmentProgram> fragmentPrograms = {};
-  static const List<String> fragmentProgramNames = [
-    'nothing',
-    'bw_split',
-    'color_split',
-    'row_offset',
-    'wavy_circ',
-    'wavy',
-    'wavy2'
-  ];
+  static final Map<Shader, ui.FragmentProgram> _programCache = {};
 
   const FragmentShaded({
-    required this.shaderName,
+    required this.shader,
     required this.shaderDuration,
     required this.child,
     super.key,
@@ -63,15 +69,16 @@ class FragmentShadedState extends State<FragmentShaded>
   }
 
   Future<void> initializeFragmentProgramsAndBuilder() async {
-    if (FragmentShaded.fragmentPrograms.isEmpty) {
-      for (String s in FragmentShaded.fragmentProgramNames) {
-        FragmentShaded.fragmentPrograms[s] =
-            await ui.FragmentProgram.fromAsset('shaders/$s.frag');
+    if (FragmentShaded._programCache.isEmpty) {
+      for (final shader in Shader.values) {
+        FragmentShaded._programCache[shader] = await shader.program;
       }
     }
-    builder = AnimatingSamplerBuilder(_controller, _dampenAnimation,
-        FragmentShaded.fragmentPrograms[widget.shaderName]!.fragmentShader());
-    setState(() {});
+
+    setState(() {
+      builder = AnimatingSamplerBuilder(_controller, _dampenAnimation,
+          FragmentShaded._programCache[widget.shader]!.fragmentShader());
+    });
   }
 
   @override
@@ -83,7 +90,7 @@ class FragmentShadedState extends State<FragmentShaded>
 
   @override
   Widget build(BuildContext context) {
-    if (null == FragmentShaded.fragmentPrograms[widget.shaderName]) {
+    if (null == FragmentShaded._programCache[widget.shader]) {
       setState(() {});
       return const SizedBox(
         width: 0,
diff --git a/experimental/varfont_shader_puzzle/lib/components/rotator_puzzle.dart b/experimental/varfont_shader_puzzle/lib/components/rotator_puzzle.dart
index 0a8fc0e4b..15a1377f2 100644
--- a/experimental/varfont_shader_puzzle/lib/components/rotator_puzzle.dart
+++ b/experimental/varfont_shader_puzzle/lib/components/rotator_puzzle.dart
@@ -16,7 +16,7 @@ class RotatorPuzzle extends StatefulWidget {
   final PageConfig pageConfig;
   final int numTiles;
   final int puzzleNum;
-  final String shaderKey;
+  final Shader shader;
   final int shaderDuration;
 
   final String tileShadedString;
@@ -31,7 +31,7 @@ class RotatorPuzzle extends StatefulWidget {
     required this.pageConfig,
     required this.numTiles,
     required this.puzzleNum,
-    required this.shaderKey,
+    required this.shader,
     required this.shaderDuration,
     required this.tileShadedString,
     required this.tileShadedStringSize,
@@ -97,7 +97,7 @@ class RotatorPuzzleState extends State<RotatorPuzzle>
         row: (i / dim).floor(),
         col: i % dim,
         parentState: this,
-        shaderKey: widget.shaderKey,
+        shader: widget.shader,
         shaderDuration: widget.shaderDuration,
         tileShadedString: widget.tileShadedString,
         tileShadedStringSize: widget.tileShadedStringSize,
@@ -213,7 +213,7 @@ class RotatorPuzzleState extends State<RotatorPuzzle>
                         child: Center(
                           child: FragmentShaded(
                             key: shadedWidgetStackHackStateKey,
-                            shaderName: widget.shaderKey,
+                            shader: widget.shader,
                             shaderDuration: widget.shaderDuration,
                             child: Padding(
                               padding: widget.tileShadedStringPadding,
@@ -246,7 +246,7 @@ class RotatorPuzzleState extends State<RotatorPuzzle>
 class RotatorPuzzleTile extends StatefulWidget {
   final int tileID;
   final RotatorPuzzleState parentState;
-  final String shaderKey;
+  final Shader shader;
   final int shaderDuration;
   final String tileShadedString;
   final double tileShadedStringSize;
@@ -265,7 +265,7 @@ class RotatorPuzzleTile extends StatefulWidget {
     required this.row,
     required this.col,
     required this.parentState,
-    required this.shaderKey,
+    required this.shader,
     required this.shaderDuration,
     required this.tileShadedString,
     required this.tileShadedStringSize,
diff --git a/experimental/varfont_shader_puzzle/lib/main.dart b/experimental/varfont_shader_puzzle/lib/main.dart
index 2cf2bb6ef..2a26e0221 100644
--- a/experimental/varfont_shader_puzzle/lib/main.dart
+++ b/experimental/varfont_shader_puzzle/lib/main.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'package:flutter/material.dart';
 import '../page_content/pages_flow.dart';
 
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/page_ascender_descender.dart b/experimental/varfont_shader_puzzle/lib/page_content/page_ascender_descender.dart
index 741710ec8..8240baaac 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/page_ascender_descender.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/page_ascender_descender.dart
@@ -200,7 +200,7 @@ class _PageAscenderDescenderState extends SinglePageState {
       pageConfig: widget.pageConfig,
       numTiles: 9,
       puzzleNum: 3,
-      shaderKey: 'row_offset',
+      shader: Shader.rowOffset,
       shaderDuration: 2000,
       tileShadedString: 'fyd',
       tileShadedStringPadding: EdgeInsets.only(
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/page_narrative_post.dart b/experimental/varfont_shader_puzzle/lib/page_content/page_narrative_post.dart
index 7df89ed84..58d26e3a9 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/page_narrative_post.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/page_narrative_post.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'package:flutter/material.dart';
 import '../components/components.dart';
 import '../page_content/pages_flow.dart';
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/page_narrative_pre.dart b/experimental/varfont_shader_puzzle/lib/page_content/page_narrative_pre.dart
index e465bdacf..40afbc352 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/page_narrative_pre.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/page_narrative_pre.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'package:flutter/material.dart';
 import '../components/components.dart';
 import '../page_content/pages_flow.dart';
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/page_optical_size.dart b/experimental/varfont_shader_puzzle/lib/page_content/page_optical_size.dart
index 1be4f6413..0d9aab049 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/page_optical_size.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/page_optical_size.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'dart:math';
 
 import 'package:flutter/material.dart';
@@ -178,7 +179,7 @@ class _PageOpticalSizeState extends SinglePageState {
       pageConfig: widget.pageConfig,
       numTiles: 16,
       puzzleNum: 4,
-      shaderKey: 'wavy',
+      shader: Shader.wavy,
       shaderDuration: 5000,
       tileShadedString: 'Z',
       tileShadedStringPadding:
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/page_weight.dart b/experimental/varfont_shader_puzzle/lib/page_content/page_weight.dart
index 56727bf44..cea3bdea7 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/page_weight.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/page_weight.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'dart:math';
 
 import 'package:flutter/material.dart';
@@ -168,7 +169,7 @@ class _PageWeightState extends SinglePageState {
       pageConfig: widget.pageConfig,
       numTiles: 9,
       puzzleNum: 1,
-      shaderKey: 'wavy2',
+      shader: Shader.wavy2,
       shaderDuration: 3000,
       tileShadedString: 'W',
       tileShadedStringPadding: EdgeInsets.only(
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/page_width.dart b/experimental/varfont_shader_puzzle/lib/page_content/page_width.dart
index ece52b1ef..a6b8aae92 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/page_width.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/page_width.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'dart:math';
 
 import 'package:flutter/material.dart';
@@ -203,7 +204,7 @@ class _PageWidthState extends SinglePageState {
       pageConfig: widget.pageConfig,
       numTiles: 16,
       puzzleNum: 2,
-      shaderKey: 'bw_split',
+      shader: Shader.bwSplit,
       shaderDuration: 2000,
       tileShadedString: 'S',
       tileShadedStringPadding: EdgeInsets.only(
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/pages.dart b/experimental/varfont_shader_puzzle/lib/page_content/pages.dart
index df882ac83..602f1aba5 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/pages.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/pages.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 export 'page_ascender_descender.dart';
 export 'page_narrative_post.dart';
 export 'page_narrative_pre.dart';
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/pages_flow.dart b/experimental/varfont_shader_puzzle/lib/page_content/pages_flow.dart
index 101fb21a8..3d8528130 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/pages_flow.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/pages_flow.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'dart:math';
 
 import 'package:flutter/material.dart';
diff --git a/experimental/varfont_shader_puzzle/lib/page_content/wallpapers_flow.dart b/experimental/varfont_shader_puzzle/lib/page_content/wallpapers_flow.dart
index ee8905b26..71d41af43 100644
--- a/experimental/varfont_shader_puzzle/lib/page_content/wallpapers_flow.dart
+++ b/experimental/varfont_shader_puzzle/lib/page_content/wallpapers_flow.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
diff --git a/experimental/varfont_shader_puzzle/lib/styles.dart b/experimental/varfont_shader_puzzle/lib/styles.dart
index 170b9ca9c..bc5718696 100644
--- a/experimental/varfont_shader_puzzle/lib/styles.dart
+++ b/experimental/varfont_shader_puzzle/lib/styles.dart
@@ -1,6 +1,7 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'package:flutter/material.dart';
 
 class TextStyles {
diff --git a/experimental/varfont_shader_puzzle/linux/CMakeLists.txt b/experimental/varfont_shader_puzzle/linux/CMakeLists.txt
index c1ee313fc..0bd54f85a 100644
--- a/experimental/varfont_shader_puzzle/linux/CMakeLists.txt
+++ b/experimental/varfont_shader_puzzle/linux/CMakeLists.txt
@@ -4,10 +4,10 @@ project(runner LANGUAGES CXX)
 
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
-set(BINARY_NAME "type_jam_github")
+set(BINARY_NAME "varfont_shader_puzzle")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.example.type_jam_github")
+set(APPLICATION_ID "com.example.varfont_shader_puzzle")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.
diff --git a/experimental/varfont_shader_puzzle/linux/my_application.cc b/experimental/varfont_shader_puzzle/linux/my_application.cc
index 97bbc5fda..af4aa59f8 100644
--- a/experimental/varfont_shader_puzzle/linux/my_application.cc
+++ b/experimental/varfont_shader_puzzle/linux/my_application.cc
@@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) {
   if (use_header_bar) {
     GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
     gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "type_jam_github");
+    gtk_header_bar_set_title(header_bar, "varfont_shader_puzzle");
     gtk_header_bar_set_show_close_button(header_bar, TRUE);
     gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
   } else {
-    gtk_window_set_title(window, "type_jam_github");
+    gtk_window_set_title(window, "varfont_shader_puzzle");
   }
 
   gtk_window_set_default_size(window, 1280, 720);
diff --git a/experimental/varfont_shader_puzzle/macos/Podfile b/experimental/varfont_shader_puzzle/macos/Podfile
index c795730db..049abe295 100644
--- a/experimental/varfont_shader_puzzle/macos/Podfile
+++ b/experimental/varfont_shader_puzzle/macos/Podfile
@@ -31,9 +31,6 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
-  target 'RunnerTests' do
-    inherit! :search_paths
-  end
 end
 
 post_install do |installer|
diff --git a/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/project.pbxproj b/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/project.pbxproj
index 31285f583..aaadba870 100644
--- a/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/project.pbxproj
+++ b/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/project.pbxproj
@@ -21,24 +21,15 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
 		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
-		71BE2173F4A873E8F1EA2E56 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6222ACE8049DB58F70F40A2C /* Pods_Runner.framework */; };
-		C7305AD5D25AF562B38BFA4C /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C99B5EE337F31460B7238F4 /* Pods_RunnerTests.framework */; };
+		D8DF93D1B0C1CECDD08EF06D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB9031E9EACA5B3A415C937C /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 33CC10EC2044A3C60003C045;
-			remoteInfo = Runner;
-		};
 		33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
@@ -62,12 +53,11 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		06B860D13CF19C818359A367 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
-		331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		159DF78E81E96D94E147C506 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		23B62A23E6853C432298DAD2 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* type_jam_github.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = type_jam_github.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* varfont_shader_puzzle.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = varfont_shader_puzzle.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -79,45 +69,24 @@
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
-		3A1117CDFB24641FC2774AF5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		5351E4FDA050CA3CA0C7DBEE /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
-		6222ACE8049DB58F70F40A2C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		6C6EA78061492F46BEDD9C33 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		6C99B5EE337F31460B7238F4 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		383E792C4D83B14A9A274BA8 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
-		8F0D380B78CD6BC7BC0ED578 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		9CB8982626DBB91364282008 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		CB9031E9EACA5B3A415C937C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		331C80D2294CF70F00263BE5 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C7305AD5D25AF562B38BFA4C /* Pods_RunnerTests.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		33CC10EA2044A3C60003C045 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				71BE2173F4A873E8F1EA2E56 /* Pods_Runner.framework in Frameworks */,
+				D8DF93D1B0C1CECDD08EF06D /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		331C80D6294CF71000263BE5 /* RunnerTests */ = {
-			isa = PBXGroup;
-			children = (
-				331C80D7294CF71000263BE5 /* RunnerTests.swift */,
-			);
-			path = RunnerTests;
-			sourceTree = "<group>";
-		};
 		33BA886A226E78AF003329D5 /* Configs */ = {
 			isa = PBXGroup;
 			children = (
@@ -134,18 +103,16 @@
 			children = (
 				33FAB671232836740065AC1E /* Runner */,
 				33CEB47122A05771004F2AC0 /* Flutter */,
-				331C80D6294CF71000263BE5 /* RunnerTests */,
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
-				556C5EE6FCB5DC433BA531FE /* Pods */,
+				E66F92F8C6CCDB2D1139E2CD /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
 		33CC10EE2044A3C60003C045 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				33CC10ED2044A3C60003C045 /* type_jam_github.app */,
-				331C80D5294CF71000263BE5 /* RunnerTests.xctest */,
+				33CC10ED2044A3C60003C045 /* varfont_shader_puzzle.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -185,62 +152,39 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		556C5EE6FCB5DC433BA531FE /* Pods */ = {
+		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				3A1117CDFB24641FC2774AF5 /* Pods-Runner.debug.xcconfig */,
-				6C6EA78061492F46BEDD9C33 /* Pods-Runner.release.xcconfig */,
-				9CB8982626DBB91364282008 /* Pods-Runner.profile.xcconfig */,
-				06B860D13CF19C818359A367 /* Pods-RunnerTests.debug.xcconfig */,
-				8F0D380B78CD6BC7BC0ED578 /* Pods-RunnerTests.release.xcconfig */,
-				5351E4FDA050CA3CA0C7DBEE /* Pods-RunnerTests.profile.xcconfig */,
+				CB9031E9EACA5B3A415C937C /* Pods_Runner.framework */,
 			);
-			name = Pods;
-			path = Pods;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
+		E66F92F8C6CCDB2D1139E2CD /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				6222ACE8049DB58F70F40A2C /* Pods_Runner.framework */,
-				6C99B5EE337F31460B7238F4 /* Pods_RunnerTests.framework */,
+				23B62A23E6853C432298DAD2 /* Pods-Runner.debug.xcconfig */,
+				159DF78E81E96D94E147C506 /* Pods-Runner.release.xcconfig */,
+				383E792C4D83B14A9A274BA8 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Frameworks;
+			name = Pods;
+			path = Pods;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		331C80D4294CF70F00263BE5 /* RunnerTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
-			buildPhases = (
-				6E3C2376838B8F6C331FBDA0 /* [CP] Check Pods Manifest.lock */,
-				331C80D1294CF70F00263BE5 /* Sources */,
-				331C80D2294CF70F00263BE5 /* Frameworks */,
-				331C80D3294CF70F00263BE5 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				331C80DA294CF71000263BE5 /* PBXTargetDependency */,
-			);
-			name = RunnerTests;
-			productName = RunnerTests;
-			productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
 		33CC10EC2044A3C60003C045 /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				1D0B8F6F97267816ADB2582C /* [CP] Check Pods Manifest.lock */,
+				2FC07238D7240456FE463656 /* [CP] Check Pods Manifest.lock */,
 				33CC10E92044A3C60003C045 /* Sources */,
 				33CC10EA2044A3C60003C045 /* Frameworks */,
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
-				C08156B71EF3E1FBDF1EF30B /* [CP] Embed Pods Frameworks */,
+				E58C211BA37AC8CDF3BCDD74 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -249,7 +193,7 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* type_jam_github.app */;
+			productReference = 33CC10ED2044A3C60003C045 /* varfont_shader_puzzle.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -262,10 +206,6 @@
 				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
-					331C80D4294CF70F00263BE5 = {
-						CreatedOnToolsVersion = 14.0;
-						TestTargetID = 33CC10EC2044A3C60003C045;
-					};
 					33CC10EC2044A3C60003C045 = {
 						CreatedOnToolsVersion = 9.2;
 						LastSwiftMigration = 1100;
@@ -296,20 +236,12 @@
 			projectRoot = "";
 			targets = (
 				33CC10EC2044A3C60003C045 /* Runner */,
-				331C80D4294CF70F00263BE5 /* RunnerTests */,
 				33CC111A2044C6BA0003C045 /* Flutter Assemble */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		331C80D3294CF70F00263BE5 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		33CC10EB2044A3C60003C045 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -322,7 +254,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1D0B8F6F97267816ADB2582C /* [CP] Check Pods Manifest.lock */ = {
+		2FC07238D7240456FE463656 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -382,29 +314,7 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
-		6E3C2376838B8F6C331FBDA0 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C08156B71EF3E1FBDF1EF30B /* [CP] Embed Pods Frameworks */ = {
+		E58C211BA37AC8CDF3BCDD74 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -424,14 +334,6 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		331C80D1294CF70F00263BE5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		33CC10E92044A3C60003C045 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -445,11 +347,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		331C80DA294CF71000263BE5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 33CC10EC2044A3C60003C045 /* Runner */;
-			targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */;
-		};
 		33CC11202044C79F0003C045 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */;
@@ -470,51 +367,6 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		331C80DB294CF71000263BE5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 06B860D13CF19C818359A367 /* Pods-RunnerTests.debug.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/type_jam_github.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/type_jam_github";
-			};
-			name = Debug;
-		};
-		331C80DC294CF71000263BE5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8F0D380B78CD6BC7BC0ED578 /* Pods-RunnerTests.release.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/type_jam_github.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/type_jam_github";
-			};
-			name = Release;
-		};
-		331C80DD294CF71000263BE5 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5351E4FDA050CA3CA0C7DBEE /* Pods-RunnerTests.profile.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/type_jam_github.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/type_jam_github";
-			};
-			name = Profile;
-		};
 		338D0CE9231458BD00FA5F75 /* Profile */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
@@ -745,16 +597,6 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				331C80DB294CF71000263BE5 /* Debug */,
-				331C80DC294CF71000263BE5 /* Release */,
-				331C80DD294CF71000263BE5 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 4b82bcbe4..dbf9fe505 100644
--- a/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/experimental/varfont_shader_puzzle/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "type_jam_github.app"
+               BuildableName = "varfont_shader_puzzle.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -31,23 +31,12 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "type_jam_github.app"
+            BuildableName = "varfont_shader_puzzle.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "331C80D4294CF70F00263BE5"
-               BuildableName = "RunnerTests.xctest"
-               BlueprintName = "RunnerTests"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -65,7 +54,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "type_jam_github.app"
+            BuildableName = "varfont_shader_puzzle.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -82,7 +71,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "type_jam_github.app"
+            BuildableName = "varfont_shader_puzzle.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
diff --git a/experimental/varfont_shader_puzzle/macos/Runner/Configs/AppInfo.xcconfig b/experimental/varfont_shader_puzzle/macos/Runner/Configs/AppInfo.xcconfig
index 0ee5ee069..13b311fd4 100644
--- a/experimental/varfont_shader_puzzle/macos/Runner/Configs/AppInfo.xcconfig
+++ b/experimental/varfont_shader_puzzle/macos/Runner/Configs/AppInfo.xcconfig
@@ -5,10 +5,10 @@
 // 'flutter create' template.
 
 // The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = type_jam_github
+PRODUCT_NAME = varfont_shader_puzzle
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.typeJamGithub
+PRODUCT_BUNDLE_IDENTIFIER = com.example.varfontShaderPuzzle
 
 // The copyright displayed in application information
 PRODUCT_COPYRIGHT = Copyright © 2023 com.example. All rights reserved.
diff --git a/experimental/varfont_shader_puzzle/macos/RunnerTests/RunnerTests.swift b/experimental/varfont_shader_puzzle/macos/RunnerTests/RunnerTests.swift
deleted file mode 100644
index 5418c9f53..000000000
--- a/experimental/varfont_shader_puzzle/macos/RunnerTests/RunnerTests.swift
+++ /dev/null
@@ -1,12 +0,0 @@
-import FlutterMacOS
-import Cocoa
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}
diff --git a/experimental/varfont_shader_puzzle/pubspec.yaml b/experimental/varfont_shader_puzzle/pubspec.yaml
index 26bb7a355..74a00a871 100644
--- a/experimental/varfont_shader_puzzle/pubspec.yaml
+++ b/experimental/varfont_shader_puzzle/pubspec.yaml
@@ -1,69 +1,27 @@
 name: varfont_shader_puzzle
 description: A new Flutter project.
-
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-# In Windows, build-name is used as the major, minor, and patch parts
-# of the product and file versions while build-number is used as the build suffix.
+publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.18.6 <3.0.0'
-  flutter: ^3.7.0-1.4.pre
-
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
+  sdk: ^2.19.0-0
+  flutter: ^3.7.0-0
 dependencies:
   flutter:
     sdk: flutter
-
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
   google_fonts: ^4.0.0
 
 dev_dependencies:
+  flutter_lints: ^2.0.0
   flutter_test:
     sdk: flutter
 
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-  flutter_lints: ^2.0.0
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
   uses-material-design: true
 
-  # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/
+
   shaders:
     - shaders/wavy.frag
     - shaders/wavy2.frag
@@ -73,12 +31,6 @@ flutter:
     - shaders/row_offset.frag
     - shaders/nothing.frag
 
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
   fonts:
     - family: Roboto
       fonts:
diff --git a/experimental/varfont_shader_puzzle/shaders/bw_split.frag b/experimental/varfont_shader_puzzle/shaders/bw_split.frag
index 6abc5d1fd..22069f86b 100644
--- a/experimental/varfont_shader_puzzle/shaders/bw_split.frag
+++ b/experimental/varfont_shader_puzzle/shaders/bw_split.frag
@@ -1,15 +1,16 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #define PI 3.1415926538
 
-layout(location = 0) uniform float uTime;
-layout(location = 1) uniform vec2 uSize;
-layout(location = 3) uniform float uDampener;
+uniform float uTime;
+uniform vec2 uSize;
+uniform float uDampener;
 
-layout(location = 0) out vec4 fragColor;
+out vec4 fragColor;
 
-layout(location = 2) uniform sampler2D uTexture;
+uniform sampler2D uTexture;
 
 void main()
 {
diff --git a/experimental/varfont_shader_puzzle/shaders/color_split.frag b/experimental/varfont_shader_puzzle/shaders/color_split.frag
index 464ad2640..99f474bb8 100644
--- a/experimental/varfont_shader_puzzle/shaders/color_split.frag
+++ b/experimental/varfont_shader_puzzle/shaders/color_split.frag
@@ -1,15 +1,16 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #define PI 3.1415926538
 
-layout(location = 0) uniform float uTime;
-layout(location = 1) uniform vec2 uSize;
-layout(location = 3) uniform float uDampener;
+uniform float uTime;
+uniform vec2 uSize;
+uniform float uDampener;
 
-layout(location = 0) out vec4 fragColor;
+out vec4 fragColor;
 
-layout(location = 2) uniform sampler2D uTexture;
+uniform sampler2D uTexture;
 
 void main()
 {
diff --git a/experimental/varfont_shader_puzzle/shaders/nothing.frag b/experimental/varfont_shader_puzzle/shaders/nothing.frag
index 19782f8f3..a9a08403e 100644
--- a/experimental/varfont_shader_puzzle/shaders/nothing.frag
+++ b/experimental/varfont_shader_puzzle/shaders/nothing.frag
@@ -1,15 +1,16 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #define PI 3.1415926538
 
-layout(location = 0) uniform float uTime;
-layout(location = 1) uniform vec2 uSize;
-layout(location = 3) uniform float uDampener;
+uniform float uTime;
+uniform vec2 uSize;
+uniform float uDampener;
 
-layout(location = 0) out vec4 fragColor;
+out vec4 fragColor;
 
-layout(location = 2) uniform sampler2D uTexture;
+uniform sampler2D uTexture;
 
 void main()
 {
diff --git a/experimental/varfont_shader_puzzle/shaders/row_offset.frag b/experimental/varfont_shader_puzzle/shaders/row_offset.frag
index 11a70f451..74e4ba707 100644
--- a/experimental/varfont_shader_puzzle/shaders/row_offset.frag
+++ b/experimental/varfont_shader_puzzle/shaders/row_offset.frag
@@ -1,15 +1,16 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #define PI 3.1415926538
 
-layout(location = 0) uniform float uTime;
-layout(location = 1) uniform vec2 uSize;
-layout(location = 3) uniform float uDampener;
+uniform float uTime;
+uniform vec2 uSize;
+uniform float uDampener;
 
-layout(location = 0) out vec4 fragColor;
+out vec4 fragColor;
 
-layout(location = 2) uniform sampler2D uTexture;
+uniform sampler2D uTexture;
 
 void main()
 {
diff --git a/experimental/varfont_shader_puzzle/shaders/wavy.frag b/experimental/varfont_shader_puzzle/shaders/wavy.frag
index 19ffd5b0d..89d5dda38 100644
--- a/experimental/varfont_shader_puzzle/shaders/wavy.frag
+++ b/experimental/varfont_shader_puzzle/shaders/wavy.frag
@@ -1,15 +1,16 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #define PI 3.1415926538
 
-layout(location = 0) uniform float uTime;
-layout(location = 1) uniform vec2 uSize; 
-layout(location = 3) uniform float uDampener;
+uniform float uTime;
+uniform vec2 uSize;
+uniform float uDampener;
 
-layout(location = 0) out vec4 fragColor;
+out vec4 fragColor;
 
-layout(location = 2) uniform sampler2D uTexture;
+uniform sampler2D uTexture;
 
 void main()
 {
diff --git a/experimental/varfont_shader_puzzle/shaders/wavy2.frag b/experimental/varfont_shader_puzzle/shaders/wavy2.frag
index f3071afe0..da92fe19a 100644
--- a/experimental/varfont_shader_puzzle/shaders/wavy2.frag
+++ b/experimental/varfont_shader_puzzle/shaders/wavy2.frag
@@ -1,15 +1,16 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #define PI 3.1415926538
 
-layout(location = 0) uniform float uTime;
-layout(location = 1) uniform vec2 uSize;
-layout(location = 3) uniform float uDampener;
+uniform float uTime;
+uniform vec2 uSize;
+uniform float uDampener;
 
-layout(location = 0) out vec4 fragColor;
+out vec4 fragColor;
 
-layout(location = 2) uniform sampler2D uTexture;
+uniform sampler2D uTexture;
 
 void main()
 {
diff --git a/experimental/varfont_shader_puzzle/shaders/wavy_circ.frag b/experimental/varfont_shader_puzzle/shaders/wavy_circ.frag
index 31c83b3f8..9d0c2ce35 100644
--- a/experimental/varfont_shader_puzzle/shaders/wavy_circ.frag
+++ b/experimental/varfont_shader_puzzle/shaders/wavy_circ.frag
@@ -1,15 +1,16 @@
 // Copyright 2023 The Flutter team. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #define PI 3.1415926538
 
-layout(location = 0) uniform float uTime;
-layout(location = 1) uniform vec2 uSize;
-layout(location = 3) uniform float uDampener;
+uniform float uTime;
+uniform vec2 uSize;
+uniform float uDampener;
 
-layout(location = 0) out vec4 fragColor;
+out vec4 fragColor;
 
-layout(location = 2) uniform sampler2D uTexture;
+uniform sampler2D uTexture;
 
 void main()
 {
diff --git a/experimental/varfont_shader_puzzle/test/widget_test.dart b/experimental/varfont_shader_puzzle/test/widget_test.dart
new file mode 100644
index 000000000..96e10aa45
--- /dev/null
+++ b/experimental/varfont_shader_puzzle/test/widget_test.dart
@@ -0,0 +1,26 @@
+// Copyright 2023 The Flutter team. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:varfont_shader_puzzle/main.dart';
+
+void main() {
+  const welcomeText =
+      'Welcome to your first day on the FontCo team! Are you ready to help us publish our newest font, Designer Pro?';
+  const welcomeTextStep2 =
+      'Oh no, you clicked the button too hard! Now the font file is glitched. Help us put the letters back together so we can launch!';
+
+  testWidgets('Initial display', (tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const TypePuzzle());
+
+    // Verify intro text
+    expect(find.text(welcomeText), findsOneWidget);
+    expect(find.text(welcomeTextStep2), findsNothing);
+
+    // Verify OK button
+    expect(find.text('OK'), findsOneWidget);
+  });
+}
diff --git a/experimental/varfont_shader_puzzle/web/favicon.png b/experimental/varfont_shader_puzzle/web/favicon.png
deleted file mode 100644
index 8aaa46ac1..000000000
Binary files a/experimental/varfont_shader_puzzle/web/favicon.png and /dev/null differ
diff --git a/experimental/varfont_shader_puzzle/web/icons/Icon-192.png b/experimental/varfont_shader_puzzle/web/icons/Icon-192.png
deleted file mode 100644
index b749bfef0..000000000
Binary files a/experimental/varfont_shader_puzzle/web/icons/Icon-192.png and /dev/null differ
diff --git a/experimental/varfont_shader_puzzle/web/icons/Icon-512.png b/experimental/varfont_shader_puzzle/web/icons/Icon-512.png
deleted file mode 100644
index 88cfd48df..000000000
Binary files a/experimental/varfont_shader_puzzle/web/icons/Icon-512.png and /dev/null differ
diff --git a/experimental/varfont_shader_puzzle/web/icons/Icon-maskable-192.png b/experimental/varfont_shader_puzzle/web/icons/Icon-maskable-192.png
deleted file mode 100644
index eb9b4d76e..000000000
Binary files a/experimental/varfont_shader_puzzle/web/icons/Icon-maskable-192.png and /dev/null differ
diff --git a/experimental/varfont_shader_puzzle/web/icons/Icon-maskable-512.png b/experimental/varfont_shader_puzzle/web/icons/Icon-maskable-512.png
deleted file mode 100644
index d69c56691..000000000
Binary files a/experimental/varfont_shader_puzzle/web/icons/Icon-maskable-512.png and /dev/null differ
diff --git a/experimental/varfont_shader_puzzle/web/index.html b/experimental/varfont_shader_puzzle/web/index.html
deleted file mode 100644
index dd57675e5..000000000
--- a/experimental/varfont_shader_puzzle/web/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <!--
-    If you are serving your web app in a path other than the root, change the
-    href value below to reflect the base path you are serving from.
-
-    The path provided below has to start and end with a slash "/" in order for
-    it to work correctly.
-
-    For more details:
-    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
-
-    This is a placeholder for base href that will be replaced by the value of
-    the `--base-href` argument provided to `flutter build`.
-  -->
-  <base href="$FLUTTER_BASE_HREF">
-
-  <meta charset="UTF-8">
-  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="A new Flutter project.">
-
-  <!-- iOS meta tags & icons -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="type_jam_github">
-  <link rel="apple-touch-icon" href="icons/Icon-192.png">
-
-  <!-- Favicon -->
-  <link rel="icon" type="image/png" href="favicon.png"/>
-
-  <title>type_jam_github</title>
-  <link rel="manifest" href="manifest.json">
-
-  <script>
-    // The value below is injected by flutter build, do not touch.
-    var serviceWorkerVersion = null;
-  </script>
-  <!-- This script adds the flutter initialization JS code -->
-  <script src="flutter.js" defer></script>
-</head>
-<body>
-  <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine().then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
-  </script>
-</body>
-</html>
diff --git a/experimental/varfont_shader_puzzle/web/manifest.json b/experimental/varfont_shader_puzzle/web/manifest.json
deleted file mode 100644
index c3e55bdbb..000000000
--- a/experimental/varfont_shader_puzzle/web/manifest.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "type_jam_github",
-    "short_name": "type_jam_github",
-    "start_url": ".",
-    "display": "standalone",
-    "background_color": "#0175C2",
-    "theme_color": "#0175C2",
-    "description": "A new Flutter project.",
-    "orientation": "portrait-primary",
-    "prefer_related_applications": false,
-    "icons": [
-        {
-            "src": "icons/Icon-192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-maskable-192.png",
-            "sizes": "192x192",
-            "type": "image/png",
-            "purpose": "maskable"
-        },
-        {
-            "src": "icons/Icon-maskable-512.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "maskable"
-        }
-    ]
-}
diff --git a/experimental/varfont_shader_puzzle/windows/CMakeLists.txt b/experimental/varfont_shader_puzzle/windows/CMakeLists.txt
index f295f30f4..29bc61876 100644
--- a/experimental/varfont_shader_puzzle/windows/CMakeLists.txt
+++ b/experimental/varfont_shader_puzzle/windows/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Project-level configuration.
 cmake_minimum_required(VERSION 3.14)
-project(type_jam_github LANGUAGES CXX)
+project(varfont_shader_puzzle LANGUAGES CXX)
 
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
-set(BINARY_NAME "type_jam_github")
+set(BINARY_NAME "varfont_shader_puzzle")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.
diff --git a/experimental/varfont_shader_puzzle/windows/runner/Runner.rc b/experimental/varfont_shader_puzzle/windows/runner/Runner.rc
index db18601ec..c6f7bda3f 100644
--- a/experimental/varfont_shader_puzzle/windows/runner/Runner.rc
+++ b/experimental/varfont_shader_puzzle/windows/runner/Runner.rc
@@ -90,12 +90,12 @@ BEGIN
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", "com.example" "\0"
-            VALUE "FileDescription", "type_jam_github" "\0"
+            VALUE "FileDescription", "varfont_shader_puzzle" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
-            VALUE "InternalName", "type_jam_github" "\0"
+            VALUE "InternalName", "varfont_shader_puzzle" "\0"
             VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0"
-            VALUE "OriginalFilename", "type_jam_github.exe" "\0"
-            VALUE "ProductName", "type_jam_github" "\0"
+            VALUE "OriginalFilename", "varfont_shader_puzzle.exe" "\0"
+            VALUE "ProductName", "varfont_shader_puzzle" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
         END
     END
diff --git a/experimental/varfont_shader_puzzle/windows/runner/main.cpp b/experimental/varfont_shader_puzzle/windows/runner/main.cpp
index 03b60cd84..b709e9fda 100644
--- a/experimental/varfont_shader_puzzle/windows/runner/main.cpp
+++ b/experimental/varfont_shader_puzzle/windows/runner/main.cpp
@@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
   FlutterWindow window(project);
   Win32Window::Point origin(10, 10);
   Win32Window::Size size(1280, 720);
-  if (!window.Create(L"type_jam_github", origin, size)) {
+  if (!window.Create(L"varfont_shader_puzzle", origin, size)) {
     return EXIT_FAILURE;
   }
   window.SetQuitOnClose(true);