diff --git a/packages/pinball_theme/assets/images/android.png b/packages/pinball_theme/assets/images/android.png
deleted file mode 100644
index 23f677a5..00000000
Binary files a/packages/pinball_theme/assets/images/android.png and /dev/null differ
diff --git a/packages/pinball_theme/assets/images/android_background.png b/packages/pinball_theme/assets/images/android/background.png
similarity index 100%
rename from packages/pinball_theme/assets/images/android_background.png
rename to packages/pinball_theme/assets/images/android/background.png
diff --git a/packages/pinball_theme/assets/images/android_placeholder.png b/packages/pinball_theme/assets/images/android/character.png
similarity index 100%
rename from packages/pinball_theme/assets/images/android_placeholder.png
rename to packages/pinball_theme/assets/images/android/character.png
diff --git a/packages/pinball_theme/assets/images/android_icon.png b/packages/pinball_theme/assets/images/android/icon.png
similarity index 100%
rename from packages/pinball_theme/assets/images/android_icon.png
rename to packages/pinball_theme/assets/images/android/icon.png
diff --git a/packages/pinball_theme/assets/images/dash.png b/packages/pinball_theme/assets/images/dash.png
deleted file mode 100644
index 43c074a3..00000000
Binary files a/packages/pinball_theme/assets/images/dash.png and /dev/null differ
diff --git a/packages/pinball_theme/assets/images/dash_background.png b/packages/pinball_theme/assets/images/dash/background.png
similarity index 100%
rename from packages/pinball_theme/assets/images/dash_background.png
rename to packages/pinball_theme/assets/images/dash/background.png
diff --git a/packages/pinball_theme/assets/images/dash_placeholder.png b/packages/pinball_theme/assets/images/dash/character.png
similarity index 100%
rename from packages/pinball_theme/assets/images/dash_placeholder.png
rename to packages/pinball_theme/assets/images/dash/character.png
diff --git a/packages/pinball_theme/assets/images/dash_icon.png b/packages/pinball_theme/assets/images/dash/icon.png
similarity index 100%
rename from packages/pinball_theme/assets/images/dash_icon.png
rename to packages/pinball_theme/assets/images/dash/icon.png
diff --git a/packages/pinball_theme/assets/images/dino.png b/packages/pinball_theme/assets/images/dino.png
deleted file mode 100644
index 9e5dbf86..00000000
Binary files a/packages/pinball_theme/assets/images/dino.png and /dev/null differ
diff --git a/packages/pinball_theme/assets/images/dino_background.png b/packages/pinball_theme/assets/images/dino/background.png
similarity index 100%
rename from packages/pinball_theme/assets/images/dino_background.png
rename to packages/pinball_theme/assets/images/dino/background.png
diff --git a/packages/pinball_theme/assets/images/dino_placeholder.png b/packages/pinball_theme/assets/images/dino/character.png
similarity index 100%
rename from packages/pinball_theme/assets/images/dino_placeholder.png
rename to packages/pinball_theme/assets/images/dino/character.png
diff --git a/packages/pinball_theme/assets/images/dino_icon.png b/packages/pinball_theme/assets/images/dino/icon.png
similarity index 100%
rename from packages/pinball_theme/assets/images/dino_icon.png
rename to packages/pinball_theme/assets/images/dino/icon.png
diff --git a/packages/pinball_theme/assets/images/sparky.png b/packages/pinball_theme/assets/images/sparky.png
deleted file mode 100644
index 8e484f26..00000000
Binary files a/packages/pinball_theme/assets/images/sparky.png and /dev/null differ
diff --git a/packages/pinball_theme/assets/images/sparky_background.png b/packages/pinball_theme/assets/images/sparky/background.png
similarity index 100%
rename from packages/pinball_theme/assets/images/sparky_background.png
rename to packages/pinball_theme/assets/images/sparky/background.png
diff --git a/packages/pinball_theme/assets/images/sparky_placeholder.png b/packages/pinball_theme/assets/images/sparky/character.png
similarity index 100%
rename from packages/pinball_theme/assets/images/sparky_placeholder.png
rename to packages/pinball_theme/assets/images/sparky/character.png
diff --git a/packages/pinball_theme/assets/images/sparky_icon.png b/packages/pinball_theme/assets/images/sparky/icon.png
similarity index 100%
rename from packages/pinball_theme/assets/images/sparky_icon.png
rename to packages/pinball_theme/assets/images/sparky/icon.png
diff --git a/packages/pinball_theme/lib/src/generated/assets.gen.dart b/packages/pinball_theme/lib/src/generated/assets.gen.dart
index 050294b2..22b6b520 100644
--- a/packages/pinball_theme/lib/src/generated/assets.gen.dart
+++ b/packages/pinball_theme/lib/src/generated/assets.gen.dart
@@ -10,73 +10,81 @@ import 'package:flutter/widgets.dart';
 class $AssetsImagesGen {
   const $AssetsImagesGen();
 
-  /// File path: assets/images/android.png
-  AssetGenImage get android => const AssetGenImage('assets/images/android.png');
+  $AssetsImagesAndroidGen get android => const $AssetsImagesAndroidGen();
+  $AssetsImagesDashGen get dash => const $AssetsImagesDashGen();
+  $AssetsImagesDinoGen get dino => const $AssetsImagesDinoGen();
 
-  /// File path: assets/images/android_background.png
-  AssetGenImage get androidBackground =>
-      const AssetGenImage('assets/images/android_background.png');
+  /// File path: assets/images/pinball_button.png
+  AssetGenImage get pinballButton =>
+      const AssetGenImage('assets/images/pinball_button.png');
+
+  /// File path: assets/images/select_character_background.png
+  AssetGenImage get selectCharacterBackground =>
+      const AssetGenImage('assets/images/select_character_background.png');
+
+  $AssetsImagesSparkyGen get sparky => const $AssetsImagesSparkyGen();
+}
 
-  /// File path: assets/images/android_icon.png
-  AssetGenImage get androidIcon =>
-      const AssetGenImage('assets/images/android_icon.png');
+class $AssetsImagesAndroidGen {
+  const $AssetsImagesAndroidGen();
 
-  /// File path: assets/images/android_placeholder.png
-  AssetGenImage get androidPlaceholder =>
-      const AssetGenImage('assets/images/android_placeholder.png');
+  /// File path: assets/images/android/background.png
+  AssetGenImage get background =>
+      const AssetGenImage('assets/images/android/background.png');
 
-  /// File path: assets/images/dash.png
-  AssetGenImage get dash => const AssetGenImage('assets/images/dash.png');
+  /// File path: assets/images/android/character.png
+  AssetGenImage get character =>
+      const AssetGenImage('assets/images/android/character.png');
 
-  /// File path: assets/images/dash_background.png
-  AssetGenImage get dashBackground =>
-      const AssetGenImage('assets/images/dash_background.png');
+  /// File path: assets/images/android/icon.png
+  AssetGenImage get icon =>
+      const AssetGenImage('assets/images/android/icon.png');
+}
 
-  /// File path: assets/images/dash_icon.png
-  AssetGenImage get dashIcon =>
-      const AssetGenImage('assets/images/dash_icon.png');
+class $AssetsImagesDashGen {
+  const $AssetsImagesDashGen();
 
-  /// File path: assets/images/dash_placeholder.png
-  AssetGenImage get dashPlaceholder =>
-      const AssetGenImage('assets/images/dash_placeholder.png');
+  /// File path: assets/images/dash/background.png
+  AssetGenImage get background =>
+      const AssetGenImage('assets/images/dash/background.png');
 
-  /// File path: assets/images/dino.png
-  AssetGenImage get dino => const AssetGenImage('assets/images/dino.png');
+  /// File path: assets/images/dash/character.png
+  AssetGenImage get character =>
+      const AssetGenImage('assets/images/dash/character.png');
 
-  /// File path: assets/images/dino_background.png
-  AssetGenImage get dinoBackground =>
-      const AssetGenImage('assets/images/dino_background.png');
+  /// File path: assets/images/dash/icon.png
+  AssetGenImage get icon => const AssetGenImage('assets/images/dash/icon.png');
+}
 
-  /// File path: assets/images/dino_icon.png
-  AssetGenImage get dinoIcon =>
-      const AssetGenImage('assets/images/dino_icon.png');
+class $AssetsImagesDinoGen {
+  const $AssetsImagesDinoGen();
 
-  /// File path: assets/images/dino_placeholder.png
-  AssetGenImage get dinoPlaceholder =>
-      const AssetGenImage('assets/images/dino_placeholder.png');
+  /// File path: assets/images/dino/background.png
+  AssetGenImage get background =>
+      const AssetGenImage('assets/images/dino/background.png');
 
-  /// File path: assets/images/pinball_button.png
-  AssetGenImage get pinballButton =>
-      const AssetGenImage('assets/images/pinball_button.png');
+  /// File path: assets/images/dino/character.png
+  AssetGenImage get character =>
+      const AssetGenImage('assets/images/dino/character.png');
 
-  /// File path: assets/images/select_character_background.png
-  AssetGenImage get selectCharacterBackground =>
-      const AssetGenImage('assets/images/select_character_background.png');
+  /// File path: assets/images/dino/icon.png
+  AssetGenImage get icon => const AssetGenImage('assets/images/dino/icon.png');
+}
 
-  /// File path: assets/images/sparky.png
-  AssetGenImage get sparky => const AssetGenImage('assets/images/sparky.png');
+class $AssetsImagesSparkyGen {
+  const $AssetsImagesSparkyGen();
 
-  /// File path: assets/images/sparky_background.png
-  AssetGenImage get sparkyBackground =>
-      const AssetGenImage('assets/images/sparky_background.png');
+  /// File path: assets/images/sparky/background.png
+  AssetGenImage get background =>
+      const AssetGenImage('assets/images/sparky/background.png');
 
-  /// File path: assets/images/sparky_icon.png
-  AssetGenImage get sparkyIcon =>
-      const AssetGenImage('assets/images/sparky_icon.png');
+  /// File path: assets/images/sparky/character.png
+  AssetGenImage get character =>
+      const AssetGenImage('assets/images/sparky/character.png');
 
-  /// File path: assets/images/sparky_placeholder.png
-  AssetGenImage get sparkyPlaceholder =>
-      const AssetGenImage('assets/images/sparky_placeholder.png');
+  /// File path: assets/images/sparky/icon.png
+  AssetGenImage get icon =>
+      const AssetGenImage('assets/images/sparky/icon.png');
 }
 
 class Assets {
diff --git a/packages/pinball_theme/lib/src/themes/android_theme.dart b/packages/pinball_theme/lib/src/themes/android_theme.dart
index f6605f52..5213df9b 100644
--- a/packages/pinball_theme/lib/src/themes/android_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/android_theme.dart
@@ -12,5 +12,5 @@ class AndroidTheme extends CharacterTheme {
   Color get ballColor => Colors.green;
 
   @override
-  AssetGenImage get characterAsset => Assets.images.android;
+  AssetGenImage get characterAsset => Assets.images.android.character;
 }
diff --git a/packages/pinball_theme/lib/src/themes/dash_theme.dart b/packages/pinball_theme/lib/src/themes/dash_theme.dart
index 1b5b357e..543894d8 100644
--- a/packages/pinball_theme/lib/src/themes/dash_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/dash_theme.dart
@@ -12,5 +12,5 @@ class DashTheme extends CharacterTheme {
   Color get ballColor => Colors.blue;
 
   @override
-  AssetGenImage get characterAsset => Assets.images.dash;
+  AssetGenImage get characterAsset => Assets.images.dash.character;
 }
diff --git a/packages/pinball_theme/lib/src/themes/dino_theme.dart b/packages/pinball_theme/lib/src/themes/dino_theme.dart
index 564cbea0..d80af459 100644
--- a/packages/pinball_theme/lib/src/themes/dino_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/dino_theme.dart
@@ -12,5 +12,5 @@ class DinoTheme extends CharacterTheme {
   Color get ballColor => Colors.grey;
 
   @override
-  AssetGenImage get characterAsset => Assets.images.dino;
+  AssetGenImage get characterAsset => Assets.images.dino.character;
 }
diff --git a/packages/pinball_theme/lib/src/themes/sparky_theme.dart b/packages/pinball_theme/lib/src/themes/sparky_theme.dart
index b4181a8c..e9f33cbd 100644
--- a/packages/pinball_theme/lib/src/themes/sparky_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/sparky_theme.dart
@@ -12,5 +12,5 @@ class SparkyTheme extends CharacterTheme {
   Color get ballColor => Colors.orange;
 
   @override
-  AssetGenImage get characterAsset => Assets.images.sparky;
+  AssetGenImage get characterAsset => Assets.images.sparky.character;
 }
diff --git a/packages/pinball_theme/pubspec.yaml b/packages/pinball_theme/pubspec.yaml
index 916da5b1..93084cca 100644
--- a/packages/pinball_theme/pubspec.yaml
+++ b/packages/pinball_theme/pubspec.yaml
@@ -21,6 +21,10 @@ flutter:
   generate: true
   assets:
     - assets/images/
+    - assets/images/android/
+    - assets/images/dash/
+    - assets/images/dino/
+    - assets/images/sparky/
 
 flutter_gen:
   assets: