diff --git a/site/data/gameTypes.json b/site/data/gameTypes.json
new file mode 100644
index 0000000..17046fc
--- /dev/null
+++ b/site/data/gameTypes.json
@@ -0,0 +1,6 @@
+{
+  "3ds": { "key": "3ds", "name": "3DS Game" },
+  "dsiware": { "key": "dsiware", "name": "DSI Ware" },
+  "eshop": { "key": "eshop", "name": "eShop" },
+  "vc": { "key": "vc", "name": "Virtual Console" }
+}
diff --git a/site/data/vcSystems.json b/site/data/vcSystems.json
new file mode 100644
index 0000000..dd28775
--- /dev/null
+++ b/site/data/vcSystems.json
@@ -0,0 +1,8 @@
+{
+  "nes": { "key": "nes", "name": "Nintendo Entertainment System" },
+  "snes": { "key": "snes", "name": "Super Nintendo Entertainment System" },
+  "gb": { "key": "gb", "name": "Game Boy" },
+  "gbc": { "key": "gbc", "name": "Game Boy Color" },
+  "gba": { "key": "gba", "name": "Game Boy Advance" },
+  "gg": { "key": "gg", "name": "Game Gear" }
+}
diff --git a/site/themes/citra-bs-theme/layouts/game/list.html b/site/themes/citra-bs-theme/layouts/game/list.html
index 3252e1f..473a2ce 100644
--- a/site/themes/citra-bs-theme/layouts/game/list.html
+++ b/site/themes/citra-bs-theme/layouts/game/list.html
@@ -30,6 +30,7 @@
 			<tr>
 				<th></th>
 				<th>Title</th>
+				<th>Type</th>
 				<th>Compatibility</th>
 				<th>Date Tested</th>
 			</tr>
@@ -44,12 +45,14 @@
 
 			{{ range .Pages }}
 			  {{- $rating := index .Site.Data.compatibility .Params.compatibility }}
-			  <tr>
-				<td style="width: 55px;"><img class="img-responsive game-icon-list" src="{{ .Site.BaseURL }}images/game/icons/{{ default (print .File.BaseFileName ".png") }}" /></td>
-				<td><a href="{{ .Permalink }}">{{ .Params.title }}</a></td>
-						<td class="compatibility-row"><div class="square-icon" style="background-color: {{ $rating.color }}"></div> {{ $rating.name }}</td>
-				<td>{{ dateFormat "January 2, 2006" .Params.testcase_date }}</td>
-			  </tr>
+				{{- $type := index .Site.Data.gameTypes (.Params.game_type | default "3ds") }}
+				<tr>
+	        <td class="col-md-1"><img src="{{ .Site.BaseURL }}images/game/icons/{{ .File.BaseFileName }}.png" /></td>
+	        <td class="col-md-6"><a href="{{ .Permalink }}">{{ .Params.title }}</a></td>
+					<td class="col-md-1"><img src="{{ .Site.BaseURL }}images/game/types/{{ $type.key }}.png" title="{{ $type.name }}" /></td>
+					<td class="col-md-1"><div class="square-icon" style="background-color: {{ $rating.color }}"></div> {{ $rating.name }}</td>
+	        <td class="col-md-3">{{ dateFormat "January 2, 2006" .Params.testcase_date }}</td>
+	      </tr>
 			{{ end }}
 		{{ end }}
 		</tbody>
diff --git a/site/themes/citra-bs-theme/layouts/game/single.html b/site/themes/citra-bs-theme/layouts/game/single.html
index 2fafcfa..b7fa15a 100644
--- a/site/themes/citra-bs-theme/layouts/game/single.html
+++ b/site/themes/citra-bs-theme/layouts/game/single.html
@@ -1,6 +1,7 @@
 {{ define "main" }}
   {{ $BaseURL := .Site.BaseURL }}
   {{ $gameName := .File.BaseFileName }}
+  {{- $type := index .Site.Data.gameTypes (.Params.game_type | default "3ds") }}
 
   <div class="alert alert-info">
     <div class="row">
@@ -41,6 +42,19 @@
             <td style="width: 120px;">Rating</td>
             <td><b><div class="square-icon" style="background-color: {{ $rating.color }}"></div> {{ $rating.name }}</b><br />{{ $rating.description }}</td>
           </tr>
+          <tr>
+            <td>Type</td>
+            <td>
+              <img src="{{ .Site.BaseURL }}images/game/types/{{ $type.key }}.png" title="{{ $type.name }}" />
+              {{- if eq $type.key "3ds" }}
+              {{- else if eq $type.key "vc" }}
+                {{- $vcSystem := index .Site.Data.vcSystems .Params.vc_system }}
+                {{ $vcSystem.name }}
+              {{- else }}
+                {{ $type.name }}
+              {{ end }}
+            </td>
+          </tr>
           <tr>
             <td>Game Icon</td>
             <td><img class="img-responsive" src="{{ .Site.BaseURL }}images/game/icons/{{ .File.BaseFileName }}.png" /></td>