diff --git a/.templates/game/$$name.k$$/definition.ts b/.templates/game/$$name.k$$/definition.ts
index 8c6a35d..6fd405a 100644
--- a/.templates/game/$$name.k$$/definition.ts
+++ b/.templates/game/$$name.k$$/definition.ts
@@ -7,6 +7,8 @@ export default function getDefinition() {
         //fontColor: '#000',
         //primaryColor: '#fff',
         //secondaryColor: '#000',
+        // fontFamily: FontUtils.PLAYFUL,
+        // stripColor: '#000',
         playerSizes: [1, 2, 3, 4],
         winMode: WinMode.MOST,
         rows: [
diff --git a/.templates/game/$$name.k$$/main.ts b/.templates/game/$$name.k$$/main.ts
new file mode 100644
index 0000000..63c0f7c
--- /dev/null
+++ b/.templates/game/$$name.k$$/main.ts
@@ -0,0 +1,8 @@
+import getDefinition from './definition';
+import $$name.p$$View from './View';
+
+const $$name.p$$ = {
+    view: $$name.p$$View,
+    definition: getDefinition(),
+};
+export default $$name.p$$;
diff --git a/src/allGames.ts b/src/allGames.ts
index 3c52ebc..02b908d 100644
--- a/src/allGames.ts
+++ b/src/allGames.ts
@@ -7,6 +7,8 @@ import Scout from './games/scout/main';
 import SevenWondersDuel from './games/seven-wonders-duel/main';
 import TerraformingMars from './games/terraforming-mars/main';
 import Wizard from './games/wizard/main';
+import Wingspan from './games/wingspan/main';
+import ForestShuffle from './games/forest-shuffle/main';
 
 export default function getAllGames() {
     return [
@@ -19,5 +21,7 @@ export default function getAllGames() {
         SevenWondersDuel,
         TerraformingMars,
         Wizard,
+        Wingspan,
+        ForestShuffle,
     ];
 }
diff --git a/src/games/forest-shuffle/definition.ts b/src/games/forest-shuffle/definition.ts
index 22a3a0a..0eca840 100644
--- a/src/games/forest-shuffle/definition.ts
+++ b/src/games/forest-shuffle/definition.ts
@@ -1,22 +1,43 @@
 import { WinMode } from '../../api/types/WinMode';
-
+import cardIcon from './assets/card.png';
+import topIcon from './assets/top.png';
+import downIcon from './assets/down.png';
+import leftIcon from './assets/left.png';
+import rightIcon from './assets/right.png';
+import caveIcon from './assets/cave.png';
 export default function getDefinition() {
     return {
-        title: 'ForestShuffle',
-        //bgColor: '#fff',
-        //fontColor: '#000',
-        //primaryColor: '#fff',
-        //secondaryColor: '#000',
-        playerSizes: [1, 2, 3, 4],
+        title: 'Forest Shuffle',
+        bgColor: '#dce2c9',
+        fontColor: '#315a39',
+        primaryColor: '#bbad86',
+        secondaryColor: '#b11917',
+        playerSizes: [2, 3, 4, 5],
         winMode: WinMode.MOST,
         rows: [
             {
-                name: 'Row1',
+                name: 'Tree',
+                icon: cardIcon,
             },
-
             {
-                name: 'Row2',
-                icon: 'src/games/forest-shuffle/assets/test.png',
+                name: 'Cards on top',
+                icon: topIcon,
+            },
+            {
+                name: 'Cards on right',
+                icon: rightIcon,
+            },
+            {
+                name: 'Cards below',
+                icon: downIcon,
+            },
+            {
+                name: 'Cards on left',
+                icon: leftIcon,
+            },
+            {
+                name: 'Cave',
+                icon: caveIcon,
             },
         ],
     };
diff --git a/src/games/forest-shuffle/main.ts b/src/games/forest-shuffle/main.ts
new file mode 100644
index 0000000..7f037c8
--- /dev/null
+++ b/src/games/forest-shuffle/main.ts
@@ -0,0 +1,8 @@
+import getDefinition from './definition';
+import ForestShuffleView from './View';
+
+const ForestShuffle = {
+    view: ForestShuffleView,
+    definition: getDefinition(),
+};
+export default ForestShuffle;
diff --git a/src/games/wingspan/assets/.gitkeep b/src/games/wingspan/assets/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/games/wingspan/assets/bird.png b/src/games/wingspan/assets/bird.png
new file mode 100644
index 0000000..24fa584
Binary files /dev/null and b/src/games/wingspan/assets/bird.png differ
diff --git a/src/games/wingspan/assets/bonus.png b/src/games/wingspan/assets/bonus.png
new file mode 100644
index 0000000..e422353
Binary files /dev/null and b/src/games/wingspan/assets/bonus.png differ
diff --git a/src/games/wingspan/assets/eggs.png b/src/games/wingspan/assets/eggs.png
new file mode 100644
index 0000000..acc5d54
Binary files /dev/null and b/src/games/wingspan/assets/eggs.png differ
diff --git a/src/games/wingspan/assets/resources.png b/src/games/wingspan/assets/resources.png
new file mode 100644
index 0000000..db9061a
Binary files /dev/null and b/src/games/wingspan/assets/resources.png differ
diff --git a/src/games/wingspan/assets/round-goals.png b/src/games/wingspan/assets/round-goals.png
new file mode 100644
index 0000000..f93af06
Binary files /dev/null and b/src/games/wingspan/assets/round-goals.png differ
diff --git a/src/games/wingspan/assets/tucked-card.png b/src/games/wingspan/assets/tucked-card.png
new file mode 100644
index 0000000..62c50a6
Binary files /dev/null and b/src/games/wingspan/assets/tucked-card.png differ
diff --git a/src/games/wingspan/definition.ts b/src/games/wingspan/definition.ts
index ace133d..727b97d 100644
--- a/src/games/wingspan/definition.ts
+++ b/src/games/wingspan/definition.ts
@@ -1,22 +1,46 @@
 import { WinMode } from '../../api/types/WinMode';
+import FontUtils from '../../api/utils/FontUtils';
+import eggIcon from './assets/eggs.png';
+import resourceIcon from './assets/resources.png';
+import roundGoalIcon from './assets/round-goals.png';
+import bonusIcon from './assets/bonus.png';
+import tuckedCardIcon from './assets/tucked-card.png';
+import birdIcon from './assets/bird.png';
 
 export default function getDefinition() {
     return {
         title: 'Wingspan',
-        //bgColor: '#fff',
-        //fontColor: '#000',
-        //primaryColor: '#fff',
-        //secondaryColor: '#000',
-        playerSizes: [1, 2, 3, 4],
+        bgColor: '#f4f5f0',
+        fontColor: '#73645b',
+        primaryColor: '#9fcccf',
+        secondaryColor: '#73645b', //73645b
+        playerSizes: [1, 2, 3, 4, 5],
+        fontFamily: FontUtils.PLAYFUL,
         winMode: WinMode.MOST,
         rows: [
             {
-                name: 'Row1',
+                name: 'Birds',
+                icon: birdIcon,
+            },
+            {
+                name: 'Bonus cards',
+                icon: bonusIcon,
+            },
+            {
+                name: 'End-of-round goals',
+                icon: roundGoalIcon,
+            },
+            {
+                name: 'Eggs on cards',
+                icon: eggIcon,
+            },
+            {
+                name: 'Food on cards',
+                icon: resourceIcon,
             },
-
             {
-                name: 'Row2',
-                icon: 'src/games/wingspan/assets/test.png',
+                name: 'Tucked cards',
+                icon: tuckedCardIcon,
             },
         ],
     };
diff --git a/src/games/wingspan/main.ts b/src/games/wingspan/main.ts
new file mode 100644
index 0000000..788d7be
--- /dev/null
+++ b/src/games/wingspan/main.ts
@@ -0,0 +1,8 @@
+import getDefinition from './definition';
+import WingspanView from './View';
+
+const Wingspan = {
+    view: WingspanView,
+    definition: getDefinition(),
+};
+export default Wingspan;