diff --git a/content/compatibility/_index.md b/content/compatibility/_index.md
index ea41ea9..72d67fe 100644
--- a/content/compatibility/_index.md
+++ b/content/compatibility/_index.md
@@ -16,20 +16,20 @@ The following table lists the compatibility between each controller (first row)
| ***Densha de GO! 64***
(Nintendo 64) | Yes | No | No | No | No | No | No | No | No | No | No |
| ***Kisha de GO!***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes | Yes (1) | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
| ***Kisha de GO!***
(Sony PlayStation) | Yes | No | No | No | No | No | No | No | No | No | No |
-| ***Densha de GO! Professional***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes | Yes (1) | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
+| ***Densha de GO! Professional***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes | Yes | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
| ***Densha de GO! Professional***
(Sony PlayStation) | Yes | No | No | No | No | No | No | No | No | No | No |
| ***Densha de GO! Nagoya Tetsudōhen***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes | Yes (1) | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
| ***Densha de GO! Nagoya Tetsudōhen***
(Sony PlayStation) | Yes | No | No | No | No | No | No | No | P5/B8 | No | No |
-| ***Densha de GO! 3***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes | Yes (1) | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
+| ***Densha de GO! 3***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes | Yes | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
| ***Densha de GO! 3***
(Sony PlayStation 2) | Yes (2) | No | No | No | Yes | No | No | No | P5/B8 | No | No |
-| ***Densha de GO! Shinkansen***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Unknown | Yes | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
+| ***Densha de GO! Shinkansen***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes | Yes | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
| ***Densha de GO! Shinkansen***
(Sony PlayStation 2) | Yes (2) | No | No | No | Yes | Yes | No | No | P5/B8 | No | No |
| ***Densha de GO! Shinkansen***
(Nintendo Wii) | No | No | No | No | No | No | No | Yes | No | No | No |
-| ***Densha de GO! Ryojōhen***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Unknown | Unknown | Yes | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
+| ***Densha de GO! Ryojōhen***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | Yes | Yes | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
| ***Densha de GO! Ryojōhen***
(Sony PlayStation 2) | [Unofficial](../adapters#playstation-2-cheat-codes-for-playstation-1-controllers) (2) | No | No | No | Yes | Yes | Yes | No | P5/B8 | No | No |
-| ***Densha de GO! Professional 2***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Unknown | Yes | Yes | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
+| ***Densha de GO! Professional 2***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | Yes | Yes | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
| ***Densha de GO! Professional 2***
(Sony PlayStation 2) | [Unofficial](../adapters#playstation-2-cheat-codes-for-playstation-1-controllers) (2) | No | No | No | Yes | Yes | Yes | No | P5/B8 | No | No |
-| ***Densha de GO! Final***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | Unknown | Yes | Yes | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
+| ***Densha de GO! Final***
(Microsoft Windows) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | Yes | Yes | [Unofficial](../adapters#converter-tool-by-autotraintas) | [Unofficial](../adapters#converter-tool-by-autotraintas) | No | No | No | [Unofficial](../adapters#converter-tool-by-autotraintas) | Yes |
| ***Densha de GO! Final***
(Sony PlayStation 2) | [Unofficial](../adapters#playstation-2-cheat-codes-for-playstation-1-controllers) (2) | No | No | No | Yes | Yes | Yes | No | P5/B8 | No | No |
| ***Densha de GO! Hashirō Yamanote‑sen***
(Sony PlayStation 4) | Yes (3) | No | Yes (4) | Untested (4) | No | No | No | No | No | No | Yes |
| ***Densha de GO! Hashirō Yamanote‑sen***
(Nintendo Switch) | Yes (3) | No | Yes (4) | Untested (4) | No | No | No | No | No | Yes | Yes |
diff --git a/content/software/dc/_index.md b/content/software/dc/_index.md
new file mode 100644
index 0000000..e0f076a
--- /dev/null
+++ b/content/software/dc/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Sega Dreamcast"
+alwaysopen: false
+---
diff --git a/content/software/dc/densha2/_index.md b/content/software/dc/densha2/_index.md
new file mode 100644
index 0000000..9cd1a71
--- /dev/null
+++ b/content/software/dc/densha2/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! 2 Kōsoku-hen 3000 Bandai"
+weight: 1
+---
+
+{{% software-page "dc_densha2" %}}
diff --git a/content/software/n64/_index.md b/content/software/n64/_index.md
new file mode 100644
index 0000000..ee651c4
--- /dev/null
+++ b/content/software/n64/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Nintendo 64"
+alwaysopen: false
+---
diff --git a/content/software/n64/densha2/_index.md b/content/software/n64/densha2/_index.md
new file mode 100644
index 0000000..7f02dcc
--- /dev/null
+++ b/content/software/n64/densha2/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! 64"
+weight: 1
+---
+
+{{% software-page "n64_densha2" %}}
diff --git a/content/software/pc/bve/_index.md b/content/software/pc/bve/_index.md
index 310817f..1b1a6ee 100644
--- a/content/software/pc/bve/_index.md
+++ b/content/software/pc/bve/_index.md
@@ -1,6 +1,6 @@
---
title: "BVE Trainsim"
-weight: 1
+weight: 98
---
{{% software-page "pc_bve" %}}
diff --git a/content/software/pc/densha/_index.md b/content/software/pc/densha/_index.md
new file mode 100644
index 0000000..fac5769
--- /dev/null
+++ b/content/software/pc/densha/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO!"
+weight: 1
+---
+
+{{% software-page "pc_densha" %}}
diff --git a/content/software/pc/densha2/_index.md b/content/software/pc/densha2/_index.md
new file mode 100644
index 0000000..d8319fe
--- /dev/null
+++ b/content/software/pc/densha2/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! 2"
+weight: 2
+---
+
+{{% software-page "pc_densha2" %}}
diff --git a/content/software/pc/densha3/_index.md b/content/software/pc/densha3/_index.md
new file mode 100644
index 0000000..6e3f743
--- /dev/null
+++ b/content/software/pc/densha3/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! 3 Tsūkin-hen"
+weight: 6
+---
+
+{{% software-page "pc_densha3" %}}
diff --git a/content/software/pc/final/_index.md b/content/software/pc/final/_index.md
new file mode 100644
index 0000000..9236558
--- /dev/null
+++ b/content/software/pc/final/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! Final"
+weight: 10
+---
+
+{{% software-page "pc_final" %}}
diff --git a/content/software/pc/kisha/_index.md b/content/software/pc/kisha/_index.md
new file mode 100644
index 0000000..10427dc
--- /dev/null
+++ b/content/software/pc/kisha/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Kisha de GO!"
+weight: 5
+---
+
+{{% software-page "pc_kisha" %}}
diff --git a/content/software/pc/nagoya/_index.md b/content/software/pc/nagoya/_index.md
new file mode 100644
index 0000000..8c0f7db
--- /dev/null
+++ b/content/software/pc/nagoya/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! Nagoya Tetsudōhen"
+weight: 4
+---
+
+{{% software-page "pc_nagoya" %}}
diff --git a/content/software/pc/openbve/_index.md b/content/software/pc/openbve/_index.md
index bf37c25..b13ef7f 100644
--- a/content/software/pc/openbve/_index.md
+++ b/content/software/pc/openbve/_index.md
@@ -1,6 +1,6 @@
---
title: "OpenBVE"
-weight: 2
+weight: 99
---
{{% software-page "pc_openbve" %}}
diff --git a/content/software/pc/pro/_index.md b/content/software/pc/pro/_index.md
new file mode 100644
index 0000000..1879563
--- /dev/null
+++ b/content/software/pc/pro/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! Professional"
+weight: 3
+---
+
+{{% software-page "pc_pro" %}}
diff --git a/content/software/pc/pro2/_index.md b/content/software/pc/pro2/_index.md
new file mode 100644
index 0000000..6bfccc7
--- /dev/null
+++ b/content/software/pc/pro2/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! Professional 2"
+weight: 9
+---
+
+{{% software-page "pc_pro2" %}}
diff --git a/content/software/pc/ryojouhen/_index.md b/content/software/pc/ryojouhen/_index.md
new file mode 100644
index 0000000..9a070ed
--- /dev/null
+++ b/content/software/pc/ryojouhen/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! Ryojōhen"
+weight: 8
+---
+
+{{% software-page "pc_ryojouhen" %}}
diff --git a/content/software/pc/shinkansen/_index.md b/content/software/pc/shinkansen/_index.md
new file mode 100644
index 0000000..8360b53
--- /dev/null
+++ b/content/software/pc/shinkansen/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! Shinkansen San'yō Shinkansen-hen"
+weight: 7
+---
+
+{{% software-page "pc_shinkansen" %}}
diff --git a/content/software/ps2/densha3/_index.md b/content/software/ps2/densha3/_index.md
index 8594c0c..ad77514 100644
--- a/content/software/ps2/densha3/_index.md
+++ b/content/software/ps2/densha3/_index.md
@@ -1,5 +1,5 @@
---
-title: "Densha de GO! 3"
+title: "Densha de GO! 3 Tsūkin-hen"
weight: 1
---
diff --git a/content/software/ss/_index.md b/content/software/ss/_index.md
new file mode 100644
index 0000000..dc3d325
--- /dev/null
+++ b/content/software/ss/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Sega Saturn"
+alwaysopen: false
+---
diff --git a/content/software/ss/densha/_index.md b/content/software/ss/densha/_index.md
new file mode 100644
index 0000000..d05e39a
--- /dev/null
+++ b/content/software/ss/densha/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Densha de GO! EX"
+weight: 1
+---
+
+{{% software-page "ss_densha" %}}
diff --git a/data/software.yml b/data/software.yml
index abbf72d..cb03d4b 100644
--- a/data/software.yml
+++ b/data/software.yml
@@ -1,3 +1,32 @@
+dc_densha2:
+ name: "Densha de GO! 2 Kōsoku-hen 3000 Bandai"
+ namejp: "電車でGO!2高速編3000番台"
+ date: 2000-01-20
+ code: "T-1102M"
+ ref: "/software/dc/densha2"
+ controllers:
+ - model: tcpp20004
+
+n64_densha2:
+ name: "Densha de GO! 64"
+ namejp: "電車でGO！64"
+ date: 1999-07-23
+ code: "NUS-ND6J-JPN"
+ ref: "/software/n64/densha2"
+ controllers:
+ - model: tcpp20003
+ notes: "Connect standard controller to P1 and train controller to P3."
+
+ss_densha:
+ name: "Densha de GO! EX"
+ namejp: "電車でGO！EX"
+ date: 1998-10-01
+ code: "T-10317G"
+ ref: "/software/ss/densha"
+ controllers:
+ - model: tc5175290
+ notes: "Select controller on game startup."
+
pc_densha:
name: "Densha de GO!"
namejp: "電車でGO！"
@@ -5,22 +34,22 @@ pc_densha:
ref: "/software/pc/densha"
controllers:
- model: dgc255
- notes: "Only republished version"
- - model: dgoc44
+ notes: "Only republished version."
- model: dgoc44u
- notes: "Only republished version"
+ notes: "Only republished version."
+ - model: dgoc44
pc_densha2:
- name: "Densha de GO! 2"
- namejp: "電車でGO！2"
+ name: "Densha de GO! 2 Kōsoku-hen"
+ namejp: "電車でGO！2高速編"
date: 1999-03-18
ref: "/software/pc/densha2"
controllers:
- model: dgc255
- notes: "Only republished version"
- - model: dgoc44
+ notes: "Only republished version."
- model: dgoc44u
- notes: "Only republished version"
+ notes: "Only republished version."
+ - model: dgoc44
pc_pro:
name: "Densha de GO! Professional"
@@ -29,21 +58,20 @@ pc_pro:
ref: "/software/pc/pro"
controllers:
- model: dgc255
- - model: dgoc44
- model: dgoc44u
- notes: "Only republished version"
+ - model: dgoc44
pc_nagoya:
- name: "Densha de GO! Nagoya Tetsudōhen"
+ name: "Densha de GO! Nagoya Tetsudō-hen"
namejp: "電車でGO！名古屋鉄道編"
date: 2000-12-01
ref: "/software/pc/nagoya"
controllers:
- model: dgc255
- notes: "Only republished version"
- - model: dgoc44
+ notes: "Only republished version."
- model: dgoc44u
- notes: "Only republished version"
+ notes: "Only republished version."
+ - model: dgoc44
pc_kisha:
name: "Kisha de GO!"
@@ -52,20 +80,20 @@ pc_kisha:
ref: "/software/pc/kisha"
controllers:
- model: dgc255
- notes: "Only republished version"
- - model: dgoc44
+ notes: "Only republished version."
- model: dgoc44u
- notes: "Only republished version"
+ notes: "Only republished version."
+ - model: dgoc44
pc_densha3:
- name: "Densha de GO! 3"
- namejp: "電車でGO！3"
+ name: "Densha de GO! 3 Tsūkin-hen Daiya Kaisei"
+ namejp: "電車でGO！3通勤編 ダイヤ改正"
date: 2002-03-21
ref: "/software/pc/densha3"
controllers:
- model: dgc255
- - model: dgoc44
- model: dgoc44u
+ - model: dgoc44
pc_shinkansen:
name: "Densha de GO! Shinkansen San'yō Shinkansen-hen"
@@ -74,8 +102,8 @@ pc_shinkansen:
ref: "/software/pc/shinkansen"
controllers:
- model: dgc255
- - model: dgoc44
- model: dgoc44u
+ - model: dgoc44
pc_ryojouhen:
name: "Densha de GO! Ryojōhen"
@@ -119,8 +147,8 @@ ps1_densha:
- model: slph00051
ps1_densha2:
- name: "Densha de GO! 2"
- namejp: "電車でGO！2"
+ name: "Densha de GO! 2 Kōsoku-hen"
+ namejp: "電車でGO！2高速編"
date: 1999-03-18
code: "SLPM-86142"
ref: "/software/ps1/densha2"
@@ -141,7 +169,7 @@ ps1_pro:
- model: slph00051
ps1_nagoya:
- name: "Densha de GO! Nagoya Tetsudōhen"
+ name: "Densha de GO! Nagoya Tetsudō-hen"
namejp: "電車でGO！名古屋鉄道編"
date: 2000-01-27
code: "SLPM-86424"
@@ -163,8 +191,8 @@ ps1_kisha:
- model: slph00051
ps2_densha3:
- name: "Densha de GO! 3"
- namejp: "電車でGO！3"
+ name: "Densha de GO! 3 Tsūkin-hen"
+ namejp: "電車でGO！3通勤編"
date: 2001-03-15
code: "SLPM-62049"
ref: "/software/ps2/densha3"