diff --git a/config.toml b/config.toml
index c30397a..3fd18f4 100644
--- a/config.toml
+++ b/config.toml
@@ -10,7 +10,7 @@ themeVariant = [ "relearn-light", "relearn-dark" ]
collapsibleMenu = true
disableLandingPageButton = true
disableShortcutsTitle=true
-custom_css = [ "css/custom.css" ]
+custom_css = [ "css/custom.css", "css/compatibility.css" ]
[markup]
[markup.goldmark]
diff --git a/content/games/ps1/densha/_index.md b/content/games/ps1/densha/_index.md
new file mode 100644
index 0000000..48690be
--- /dev/null
+++ b/content/games/ps1/densha/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO!"
+weight: 1
+---
+
+{{% game-page "ps1_densha" %}}
diff --git a/content/games/wii/shinkansen/_index.md b/content/games/wii/shinkansen/_index.md
index 999f79f..4f625d9 100644
--- a/content/games/wii/shinkansen/_index.md
+++ b/content/games/wii/shinkansen/_index.md
@@ -1,14 +1,6 @@
---
-title: "Densha de Go! Shinkansen EX San'yō Shinkansen-hen"
+title: "Densha de GO! Shinkansen EX San'yō Shinkansen-hen"
weight: 1
---
-## Game details
-
-{{< game-table "wii_shinkansen" >}}
-
-## Controller compatibility
-
-| Model | Notes |
-|:----------------------------------------|:-------|
-| TCPP-20017: Shinkansen controller (Wii) | Native |
+{{% game-page "wii_shinkansen" %}}
diff --git a/data/controllers.yml b/data/controllers.yml
new file mode 100644
index 0000000..1f711e5
--- /dev/null
+++ b/data/controllers.yml
@@ -0,0 +1,23 @@
+slph00051:
+ name: "Two-handle controller (PlayStation)"
+ date: 2007-03-01
+ code: "SLPH-00051"
+ ref: "/controllers/classic/slph00051"
+
+tcpp20001:
+ name: "Single-handle controller (PlayStation)"
+ date: 2007-03-01
+ code: "TCPP-20001"
+ ref: "/controllers/classic/tcpp20001"
+
+tcpp20002:
+ name: "Mamecon controller (PlayStation)"
+ date: 2007-03-01
+ code: "TCPP-20002"
+ ref: "/controllers/classic/tcpp20002"
+
+tcpp20017:
+ name: "Shinkansen controller (Wii)"
+ date: 2007-03-01
+ code: "TCPP-20017"
+ ref: "/controllers/wii/tcpp20017"
diff --git a/data/games.yml b/data/games.yml
new file mode 100644
index 0000000..2f40f5a
--- /dev/null
+++ b/data/games.yml
@@ -0,0 +1,18 @@
+ps1_densha:
+ name: "Densha de GO!"
+ namejp: "電車でGO!"
+ date: 1997-12-18
+ code: "SCPS-45166"
+ controllers:
+ - model: slph00051
+ - model: tcpp20001
+ - model: tcpp20002
+
+wii_shinkansen:
+ name: "Densha de GO! Shinkansen EX San'yō Shinkansen-hen"
+ namejp: "電車でGO!新幹線EX 山陽新幹線編"
+ date: 2007-03-01
+ code: "RVL-P-RG4J"
+ cover: "wii_shinkansen.jpg"
+ controllers:
+ - model: tcpp20017
diff --git a/data/games/wii_shinkansen.yml b/data/games/wii_shinkansen.yml
deleted file mode 100644
index 794b09d..0000000
--- a/data/games/wii_shinkansen.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "Densha de Go! Shinkansen EX San'yō Shinkansen-hen"
-namejp: "電車でGO!新幹線EX 山陽新幹線編"
-date: 2007-03-01
-code: "RVL-P-RG4J"
diff --git a/layouts/shortcodes/game-page.html b/layouts/shortcodes/game-page.html
new file mode 100644
index 0000000..d09f772
--- /dev/null
+++ b/layouts/shortcodes/game-page.html
@@ -0,0 +1,36 @@
+## Game details
+
+
+
+ {{ if (index .Site.Data.games (.Get 0)).cover}} {{ end }} |
+ Name |
+ {{ (index .Site.Data.games (.Get 0)).name }} |
+
+
+ Japanese name |
+ {{ (index .Site.Data.games (.Get 0)).namejp }} |
+
+
+ Release date |
+ {{ (index .Site.Data.games (.Get 0)).date | time.Format ":date_long" }} |
+
+
+ Serial code |
+ {{ (index .Site.Data.games (.Get 0)).code }} |
+
+
+
+## Controller compatibility
+
+
+
+ Model |
+ Notes |
+
+ {{ range (index .Site.Data.games (.Get 0)).controllers }}
+
+ {{ (index $.Site.Data.controllers .model).code }}: {{ (index $.Site.Data.controllers .model).name }} |
+ {{ .notes }} |
+
+ {{ end }}
+
diff --git a/layouts/shortcodes/game-table.html b/layouts/shortcodes/game-table.html
deleted file mode 100644
index 693b689..0000000
--- a/layouts/shortcodes/game-table.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-  |
- Name |
- {{ (index .Site.Data.games "wii_shinkansen").name }} |
-
-
- Japanese name |
- {{ (index .Site.Data.games "wii_shinkansen").namejp }} |
-
-
- Release date |
- {{ (index .Site.Data.games "wii_shinkansen").date }} |
-
-
- Serial code |
- {{ (index .Site.Data.games "wii_shinkansen").code }} |
-
-
diff --git a/static/css/compatibility.css b/static/css/compatibility.css
new file mode 100644
index 0000000..6b3f778
--- /dev/null
+++ b/static/css/compatibility.css
@@ -0,0 +1,7 @@
+table #native {
+ background-color: rgba(189,233,186,.35);
+}
+
+table #adapter {
+ background-color: rgba(255,215,140,.35);
+}
diff --git a/content/games/wii/shinkansen/cover.jpg b/static/images/covers/wii_shinkansen.jpg
similarity index 100%
rename from content/games/wii/shinkansen/cover.jpg
rename to static/images/covers/wii_shinkansen.jpg