diff --git a/lib/leaderboard/models/leader_board_entry.dart b/lib/leaderboard/models/leader_board_entry.dart
index 194f7cb6..cfd5ffd4 100644
--- a/lib/leaderboard/models/leader_board_entry.dart
+++ b/lib/leaderboard/models/leader_board_entry.dart
@@ -36,7 +36,7 @@ extension LeaderboardEntryDataX on LeaderboardEntryData {
       rank: position.toString(),
       playerInitials: playerInitials,
       score: score,
-      character: character.toTheme.characterAsset,
+      character: character.toTheme.character,
     );
   }
 }
diff --git a/lib/theme/view/character_selection_page.dart b/lib/theme/view/character_selection_page.dart
index 9569760a..119a897e 100644
--- a/lib/theme/view/character_selection_page.dart
+++ b/lib/theme/view/character_selection_page.dart
@@ -122,7 +122,7 @@ class CharacterImageButton extends StatelessWidget {
         ),
         child: Padding(
           padding: const EdgeInsets.all(8),
-          child: characterTheme.characterAsset.image(),
+          child: characterTheme.character.image(),
         ),
       ),
     );
diff --git a/packages/pinball_theme/lib/src/themes/android_theme.dart b/packages/pinball_theme/lib/src/themes/android_theme.dart
index 08c753fe..2a59cb61 100644
--- a/packages/pinball_theme/lib/src/themes/android_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/android_theme.dart
@@ -15,14 +15,11 @@ class AndroidTheme extends CharacterTheme {
   Color get ballColor => Colors.green;
 
   @override
-  AssetGenImage get characterAsset => Assets.images.android;
+  AssetGenImage get character => Assets.images.android.character;
 
   @override
-  AssetGenImage get backgroundAsset => Assets.images.androidBackground;
+  AssetGenImage get background => Assets.images.android.background;
 
   @override
-  AssetGenImage get placeholderAsset => Assets.images.androidPlaceholder;
-
-  @override
-  AssetGenImage get iconAsset => Assets.images.androidIcon;
+  AssetGenImage get icon => Assets.images.android.icon;
 }
diff --git a/packages/pinball_theme/lib/src/themes/character_theme.dart b/packages/pinball_theme/lib/src/themes/character_theme.dart
index 141a818e..0a81fae8 100644
--- a/packages/pinball_theme/lib/src/themes/character_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/character_theme.dart
@@ -19,24 +19,20 @@ abstract class CharacterTheme extends Equatable {
   Color get ballColor;
 
   /// Asset for the theme character.
-  AssetGenImage get characterAsset;
+  AssetGenImage get character;
 
   /// Asset for the background.
-  AssetGenImage get backgroundAsset;
-
-  /// Asset for the placeholder.
-  AssetGenImage get placeholderAsset;
+  AssetGenImage get background;
 
   /// Icon asset.
-  AssetGenImage get iconAsset;
+  AssetGenImage get icon;
 
   @override
   List<Object?> get props => [
         name,
         ballColor,
-        characterAsset,
-        backgroundAsset,
-        placeholderAsset,
-        iconAsset,
+        character,
+        background,
+        icon,
       ];
 }
diff --git a/packages/pinball_theme/lib/src/themes/dash_theme.dart b/packages/pinball_theme/lib/src/themes/dash_theme.dart
index bc6a7f1a..df6cf363 100644
--- a/packages/pinball_theme/lib/src/themes/dash_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/dash_theme.dart
@@ -15,14 +15,11 @@ class DashTheme extends CharacterTheme {
   Color get ballColor => Colors.blue;
 
   @override
-  AssetGenImage get characterAsset => Assets.images.dash;
+  AssetGenImage get character => Assets.images.dash.character;
 
   @override
-  AssetGenImage get backgroundAsset => Assets.images.dashBackground;
+  AssetGenImage get background => Assets.images.dash.background;
 
   @override
-  AssetGenImage get placeholderAsset => Assets.images.dashPlaceholder;
-
-  @override
-  AssetGenImage get iconAsset => Assets.images.dashIcon;
+  AssetGenImage get icon => Assets.images.dash.icon;
 }
diff --git a/packages/pinball_theme/lib/src/themes/dino_theme.dart b/packages/pinball_theme/lib/src/themes/dino_theme.dart
index 7d350d9a..b1a5a32f 100644
--- a/packages/pinball_theme/lib/src/themes/dino_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/dino_theme.dart
@@ -15,14 +15,11 @@ class DinoTheme extends CharacterTheme {
   Color get ballColor => Colors.grey;
 
   @override
-  AssetGenImage get characterAsset => Assets.images.dino;
+  AssetGenImage get character => Assets.images.dino.character;
 
   @override
-  AssetGenImage get backgroundAsset => Assets.images.dinoBackground;
+  AssetGenImage get background => Assets.images.dino.background;
 
   @override
-  AssetGenImage get placeholderAsset => Assets.images.dinoPlaceholder;
-
-  @override
-  AssetGenImage get iconAsset => Assets.images.dinoIcon;
+  AssetGenImage get icon => Assets.images.dino.icon;
 }
diff --git a/packages/pinball_theme/lib/src/themes/sparky_theme.dart b/packages/pinball_theme/lib/src/themes/sparky_theme.dart
index 297bdbf4..7990e2c3 100644
--- a/packages/pinball_theme/lib/src/themes/sparky_theme.dart
+++ b/packages/pinball_theme/lib/src/themes/sparky_theme.dart
@@ -15,14 +15,11 @@ class SparkyTheme extends CharacterTheme {
   String get name => 'Sparky';
 
   @override
-  AssetGenImage get characterAsset => Assets.images.sparky;
+  AssetGenImage get character => Assets.images.sparky.character;
 
   @override
-  AssetGenImage get backgroundAsset => Assets.images.sparkyBackground;
+  AssetGenImage get background => Assets.images.sparky.background;
 
   @override
-  AssetGenImage get placeholderAsset => Assets.images.sparkyPlaceholder;
-
-  @override
-  AssetGenImage get iconAsset => Assets.images.sparkyIcon;
+  AssetGenImage get icon => Assets.images.sparky.icon;
 }
diff --git a/packages/pinball_theme/test/src/themes/android_theme_test.dart b/packages/pinball_theme/test/src/themes/android_theme_test.dart
index e46e82cd..5dd10283 100644
--- a/packages/pinball_theme/test/src/themes/android_theme_test.dart
+++ b/packages/pinball_theme/test/src/themes/android_theme_test.dart
@@ -18,26 +18,22 @@ void main() {
       expect(AndroidTheme().ballColor, equals(Colors.green));
     });
 
-    test('characterAsset is correct', () {
-      expect(AndroidTheme().characterAsset, equals(Assets.images.android));
-    });
-
-    test('backgroundAsset is correct', () {
+    test('character asset is correct', () {
       expect(
-        AndroidTheme().backgroundAsset,
-        equals(Assets.images.androidBackground),
+        AndroidTheme().character,
+        equals(Assets.images.android.character),
       );
     });
 
-    test('iconAsset is correct', () {
-      expect(AndroidTheme().iconAsset, equals(Assets.images.androidIcon));
-    });
-
-    test('placeholderAsset is correct', () {
+    test('background asset is correct', () {
       expect(
-        AndroidTheme().placeholderAsset,
-        equals(Assets.images.androidPlaceholder),
+        AndroidTheme().background,
+        equals(Assets.images.android.background),
       );
     });
+
+    test('icon asset is correct', () {
+      expect(AndroidTheme().icon, equals(Assets.images.android.icon));
+    });
   });
 }
diff --git a/packages/pinball_theme/test/src/themes/dash_theme_test.dart b/packages/pinball_theme/test/src/themes/dash_theme_test.dart
index 96770fe6..1180eeb5 100644
--- a/packages/pinball_theme/test/src/themes/dash_theme_test.dart
+++ b/packages/pinball_theme/test/src/themes/dash_theme_test.dart
@@ -18,26 +18,22 @@ void main() {
       expect(DashTheme().ballColor, equals(Colors.blue));
     });
 
-    test('characterAsset is correct', () {
-      expect(DashTheme().characterAsset, equals(Assets.images.dash));
-    });
-
-    test('backgroundAsset is correct', () {
+    test('character asset is correct', () {
       expect(
-        DashTheme().backgroundAsset,
-        equals(Assets.images.dashBackground),
+        DashTheme().character,
+        equals(Assets.images.dash.character),
       );
     });
 
-    test('iconAsset is correct', () {
-      expect(DashTheme().iconAsset, equals(Assets.images.dashIcon));
-    });
-
-    test('placeholderAsset is correct', () {
+    test('background asset is correct', () {
       expect(
-        DashTheme().placeholderAsset,
-        equals(Assets.images.dashPlaceholder),
+        DashTheme().background,
+        equals(Assets.images.dash.background),
       );
     });
+
+    test('icon asset is correct', () {
+      expect(DashTheme().icon, equals(Assets.images.dash.icon));
+    });
   });
 }
diff --git a/packages/pinball_theme/test/src/themes/dino_theme_test.dart b/packages/pinball_theme/test/src/themes/dino_theme_test.dart
index 9837dd69..061ebf8d 100644
--- a/packages/pinball_theme/test/src/themes/dino_theme_test.dart
+++ b/packages/pinball_theme/test/src/themes/dino_theme_test.dart
@@ -18,26 +18,22 @@ void main() {
       expect(DinoTheme().ballColor, equals(Colors.grey));
     });
 
-    test('characterAsset is correct', () {
-      expect(DinoTheme().characterAsset, equals(Assets.images.dino));
-    });
-
-    test('backgroundAsset is correct', () {
+    test('character asset is correct', () {
       expect(
-        DinoTheme().backgroundAsset,
-        equals(Assets.images.dinoBackground),
+        DinoTheme().character,
+        equals(Assets.images.dino.character),
       );
     });
 
-    test('iconAsset is correct', () {
-      expect(DinoTheme().iconAsset, equals(Assets.images.dinoIcon));
-    });
-
-    test('placeholderAsset is correct', () {
+    test('background asset is correct', () {
       expect(
-        DinoTheme().placeholderAsset,
-        equals(Assets.images.dinoPlaceholder),
+        DinoTheme().background,
+        equals(Assets.images.dino.background),
       );
     });
+
+    test('icon asset is correct', () {
+      expect(DinoTheme().icon, equals(Assets.images.dino.icon));
+    });
   });
 }
diff --git a/packages/pinball_theme/test/src/themes/sparky_theme_test.dart b/packages/pinball_theme/test/src/themes/sparky_theme_test.dart
index 96cd673a..bf18211d 100644
--- a/packages/pinball_theme/test/src/themes/sparky_theme_test.dart
+++ b/packages/pinball_theme/test/src/themes/sparky_theme_test.dart
@@ -18,26 +18,22 @@ void main() {
       expect(SparkyTheme().ballColor, equals(Colors.orange));
     });
 
-    test('characterAsset is correct', () {
-      expect(SparkyTheme().characterAsset, equals(Assets.images.sparky));
-    });
-
-    test('backgroundAsset is correct', () {
+    test('character asset is correct', () {
       expect(
-        SparkyTheme().backgroundAsset,
-        equals(Assets.images.sparkyBackground),
+        SparkyTheme().character,
+        equals(Assets.images.sparky.character),
       );
     });
 
-    test('iconAsset is correct', () {
-      expect(SparkyTheme().iconAsset, equals(Assets.images.sparkyIcon));
-    });
-
-    test('placeholderAsset is correct', () {
+    test('background asset is correct', () {
       expect(
-        SparkyTheme().placeholderAsset,
-        equals(Assets.images.sparkyPlaceholder),
+        SparkyTheme().background,
+        equals(Assets.images.sparky.background),
       );
     });
+
+    test('icon asset is correct', () {
+      expect(SparkyTheme().icon, equals(Assets.images.sparky.icon));
+    });
   });
 }
diff --git a/test/leaderboard/bloc/leaderboard_state_test.dart b/test/leaderboard/bloc/leaderboard_state_test.dart
index a40a1cdb..ec455f1f 100644
--- a/test/leaderboard/bloc/leaderboard_state_test.dart
+++ b/test/leaderboard/bloc/leaderboard_state_test.dart
@@ -30,7 +30,7 @@ void main() {
         rank: '1',
         playerInitials: 'ABC',
         score: 1500,
-        character: DashTheme().characterAsset,
+        character: DashTheme().character,
       );
 
       test(
diff --git a/test/leaderboard/view/leaderboard_page_test.dart b/test/leaderboard/view/leaderboard_page_test.dart
index 4221d727..b17c27b8 100644
--- a/test/leaderboard/view/leaderboard_page_test.dart
+++ b/test/leaderboard/view/leaderboard_page_test.dart
@@ -121,7 +121,7 @@ void main() {
               rank: '1',
               playerInitials: 'ABC',
               score: 10000,
-              character: DashTheme().characterAsset,
+              character: DashTheme().character,
             ),
           ],
         ),