diff --git a/games/.gitkeep b/games/.gitkeep
deleted file mode 100644
index 8d1c8b6..0000000
--- a/games/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/games/1-2-switch/game.dat b/games/1-2-switch/game.dat
new file mode 100644
index 0000000..c983e2e
--- /dev/null
+++ b/games/1-2-switch/game.dat
@@ -0,0 +1,11 @@
+title = "1-2-Switch!"
+description = "1-2-Switch is a party game developed and published by Nintendo. The game extensively uses the system's Joy-Con controllers, with players facing each other performing various minigames."
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "01000320000CC000"
+region = "all"
+release_date = "2017-03-03"
diff --git a/games/1-2-switch/icon.png b/games/1-2-switch/icon.png
new file mode 100644
index 0000000..1b54d75
Binary files /dev/null and b/games/1-2-switch/icon.png differ
diff --git a/games/1-2-switch/screenshots/10.png b/games/1-2-switch/screenshots/10.png
new file mode 100644
index 0000000..5bbd97a
Binary files /dev/null and b/games/1-2-switch/screenshots/10.png differ
diff --git a/games/cave-story-plus/game.dat b/games/cave-story-plus/game.dat
new file mode 100644
index 0000000..968ac28
--- /dev/null
+++ b/games/cave-story-plus/game.dat
@@ -0,0 +1,15 @@
+title = "Cave Story+"
+description = "Cave Story is a metroidvania platform-adventure video game. It was developed over five years by Daisuke Pixel Amaya in his free time. Cave Story features 2D platform mechanics and is reminiscent of the classic games Amaya played in his youth. Cave Story is considered by many as the quintessential indie game, based on its one-man development team and influence on the gaming world."
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "0100B7D0022EE000"
+region = "usa"
+release_date = "2017-06-20"
+
+title = "0100B7D0022EE000"
+region = "eur"
+release_date = "2017-07-20"
diff --git a/games/cave-story-plus/icon.png b/games/cave-story-plus/icon.png
new file mode 100644
index 0000000..5ad3103
Binary files /dev/null and b/games/cave-story-plus/icon.png differ
diff --git a/games/cave-story-plus/screenshots/1.png b/games/cave-story-plus/screenshots/1.png
new file mode 100644
index 0000000..4189322
Binary files /dev/null and b/games/cave-story-plus/screenshots/1.png differ
diff --git a/games/cave-story-plus/screenshots/2.png b/games/cave-story-plus/screenshots/2.png
new file mode 100644
index 0000000..105bc3e
Binary files /dev/null and b/games/cave-story-plus/screenshots/2.png differ
diff --git a/games/cave-story-plus/screenshots/3.png b/games/cave-story-plus/screenshots/3.png
new file mode 100644
index 0000000..7158f68
Binary files /dev/null and b/games/cave-story-plus/screenshots/3.png differ
diff --git a/games/one-piece-unlimited-world-red-deluxe/game.dat b/games/one-piece-unlimited-world-red-deluxe/game.dat
new file mode 100644
index 0000000..6c79b58
--- /dev/null
+++ b/games/one-piece-unlimited-world-red-deluxe/game.dat
@@ -0,0 +1,19 @@
+title = "One Piece: Unlimited World Red Deluxe"
+description = "One Piece: Unlimited World Red Deluxe is an action-adventure video game based on the famous One Piece manga and anime. This is the thirty-sixth video game based on the series."
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "0100574002AF4000"
+region = "jpn"
+release_date = "2017-08-24"
+
+title = "0100574002AF4000"
+region = "eur"
+release_date = "2017-09-29"
+
+title = "0100574002AF4000"
+region = "usa"
+release_date = "2017-09-29"
diff --git a/games/one-piece-unlimited-world-red-deluxe/icon.png b/games/one-piece-unlimited-world-red-deluxe/icon.png
new file mode 100644
index 0000000..895cfe8
Binary files /dev/null and b/games/one-piece-unlimited-world-red-deluxe/icon.png differ
diff --git a/games/one-piece-unlimited-world-red-deluxe/screenshots/4.png b/games/one-piece-unlimited-world-red-deluxe/screenshots/4.png
new file mode 100644
index 0000000..a5813ea
Binary files /dev/null and b/games/one-piece-unlimited-world-red-deluxe/screenshots/4.png differ
diff --git a/games/puyo-puyo-tetris/game.dat b/games/puyo-puyo-tetris/game.dat
new file mode 100644
index 0000000..96d0740
--- /dev/null
+++ b/games/puyo-puyo-tetris/game.dat
@@ -0,0 +1,19 @@
+title = "Puyo Puyo Tetris"
+description = "Puyo Puyo Tetris is a puzzle video game developed by Sonic Team and published by Sega. The game is a crossover between the Puyo Puyo series and the Tetris franchise, and features various gameplay modes incorporating both aspects."
+github_issues = []
+needs_system_files = false
+needs_shared_font = true
+game_type = "switch"
+
+[[ releases ]]
+title = "010073C001D5E000"
+region = "usa"
+release_date = "2017-04-25"
+
+title = "0100F3D001DEE000"
+region = "eur"
+release_date = "2017-04-28"
+
+title = "010053D0001BE000"
+region = "jpn"
+release_date = "2017-03-03"
diff --git a/games/puyo-puyo-tetris/icon.png b/games/puyo-puyo-tetris/icon.png
new file mode 100644
index 0000000..13c8f46
Binary files /dev/null and b/games/puyo-puyo-tetris/icon.png differ
diff --git a/games/puyo-puyo-tetris/screenshots/8.png b/games/puyo-puyo-tetris/screenshots/8.png
new file mode 100644
index 0000000..4e63f9b
Binary files /dev/null and b/games/puyo-puyo-tetris/screenshots/8.png differ
diff --git a/games/puyo-puyo-tetris/screenshots/9.png b/games/puyo-puyo-tetris/screenshots/9.png
new file mode 100644
index 0000000..151cde4
Binary files /dev/null and b/games/puyo-puyo-tetris/screenshots/9.png differ
diff --git a/games/the-binding-of-isaac-afterbirth-plus/game.dat b/games/the-binding-of-isaac-afterbirth-plus/game.dat
new file mode 100644
index 0000000..2a28248
--- /dev/null
+++ b/games/the-binding-of-isaac-afterbirth-plus/game.dat
@@ -0,0 +1,15 @@
+title = "The Binding of Isaac: Afterbirth+"
+description = "The Binding of Isaac: Afterbirth+ is an independent roguelike video game designed by Edmund McMillen and developed and published by Nicalis."
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "010021C000B6A000"
+region = "usa"
+release_date = "2017-03-17"
+
+title = "0100F8A004458000"
+region = "eur"
+release_date = "2017-03-17"
diff --git a/games/the-binding-of-isaac-afterbirth-plus/icon.png b/games/the-binding-of-isaac-afterbirth-plus/icon.png
new file mode 100644
index 0000000..79198d2
Binary files /dev/null and b/games/the-binding-of-isaac-afterbirth-plus/icon.png differ
diff --git a/games/the-binding-of-isaac-afterbirth-plus/screenshots/5.png b/games/the-binding-of-isaac-afterbirth-plus/screenshots/5.png
new file mode 100644
index 0000000..ccf0fc6
Binary files /dev/null and b/games/the-binding-of-isaac-afterbirth-plus/screenshots/5.png differ
diff --git a/games/the-binding-of-isaac-afterbirth-plus/screenshots/6.png b/games/the-binding-of-isaac-afterbirth-plus/screenshots/6.png
new file mode 100644
index 0000000..5a4e38d
Binary files /dev/null and b/games/the-binding-of-isaac-afterbirth-plus/screenshots/6.png differ
diff --git a/games/the-binding-of-isaac-afterbirth-plus/screenshots/7.png b/games/the-binding-of-isaac-afterbirth-plus/screenshots/7.png
new file mode 100644
index 0000000..6b0dcd5
Binary files /dev/null and b/games/the-binding-of-isaac-afterbirth-plus/screenshots/7.png differ
diff --git a/games/tiny-barbarian-dx/game.dat b/games/tiny-barbarian-dx/game.dat
new file mode 100644
index 0000000..1275658
--- /dev/null
+++ b/games/tiny-barbarian-dx/game.dat
@@ -0,0 +1,11 @@
+title = "Tiny Barbarian DX"
+description = "Tiny Barbarian DX is a action and hack-and-slash game published by Nicalis. It strongly incorporates retro style graphics and sound."
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "0100D940022F6000"
+region = "all"
+release_date = "2017-10-10"
diff --git a/games/tiny-barbarian-dx/icon.png b/games/tiny-barbarian-dx/icon.png
new file mode 100644
index 0000000..2c77376
Binary files /dev/null and b/games/tiny-barbarian-dx/icon.png differ