diff --git a/docs/assets/images/screenshots/breakup-simulator-portable/screenshot.png b/docs/assets/images/screenshots/breakup-simulator-portable/screenshot.png
new file mode 100644
index 000000000..3361a67f1
Binary files /dev/null and b/docs/assets/images/screenshots/breakup-simulator-portable/screenshot.png differ
diff --git a/docs/assets/images/screenshots/bullets/screenshot.png b/docs/assets/images/screenshots/bullets/screenshot.png
new file mode 100644
index 000000000..0f0fbcbc5
Binary files /dev/null and b/docs/assets/images/screenshots/bullets/screenshot.png differ
diff --git a/docs/assets/images/screenshots/citrahold/1.png b/docs/assets/images/screenshots/citrahold/1.png
new file mode 100644
index 000000000..9459d4d19
Binary files /dev/null and b/docs/assets/images/screenshots/citrahold/1.png differ
diff --git a/docs/assets/images/screenshots/citrahold/2.png b/docs/assets/images/screenshots/citrahold/2.png
new file mode 100644
index 000000000..54eef1312
Binary files /dev/null and b/docs/assets/images/screenshots/citrahold/2.png differ
diff --git a/docs/assets/images/screenshots/citrahold/3.png b/docs/assets/images/screenshots/citrahold/3.png
new file mode 100644
index 000000000..9e43a78a4
Binary files /dev/null and b/docs/assets/images/screenshots/citrahold/3.png differ
diff --git a/docs/assets/images/screenshots/citrahold/4.png b/docs/assets/images/screenshots/citrahold/4.png
new file mode 100644
index 000000000..8c31172e8
Binary files /dev/null and b/docs/assets/images/screenshots/citrahold/4.png differ
diff --git a/docs/assets/images/screenshots/mars3ds/3dsmenu.png b/docs/assets/images/screenshots/mars3ds/3dsmenu.png
new file mode 100644
index 000000000..0551f5abd
Binary files /dev/null and b/docs/assets/images/screenshots/mars3ds/3dsmenu.png differ
diff --git a/docs/assets/images/screenshots/mars3ds/game.png b/docs/assets/images/screenshots/mars3ds/game.png
new file mode 100644
index 000000000..9cad2b214
Binary files /dev/null and b/docs/assets/images/screenshots/mars3ds/game.png differ
diff --git a/docs/assets/images/screenshots/mars3ds/instru.png b/docs/assets/images/screenshots/mars3ds/instru.png
new file mode 100644
index 000000000..40d399f8f
Binary files /dev/null and b/docs/assets/images/screenshots/mars3ds/instru.png differ
diff --git a/docs/assets/images/screenshots/mars3ds/menu.png b/docs/assets/images/screenshots/mars3ds/menu.png
new file mode 100644
index 000000000..25a557d59
Binary files /dev/null and b/docs/assets/images/screenshots/mars3ds/menu.png differ
diff --git a/docs/assets/images/screenshots/mars3ds/splash.png b/docs/assets/images/screenshots/mars3ds/splash.png
new file mode 100644
index 000000000..33c4f5104
Binary files /dev/null and b/docs/assets/images/screenshots/mars3ds/splash.png differ
diff --git a/docs/assets/images/screenshots/spirited-ds/game1.png b/docs/assets/images/screenshots/spirited-ds/game1.png
new file mode 100644
index 000000000..3af716f05
Binary files /dev/null and b/docs/assets/images/screenshots/spirited-ds/game1.png differ
diff --git a/docs/assets/images/screenshots/spirited-ds/game2.png b/docs/assets/images/screenshots/spirited-ds/game2.png
new file mode 100644
index 000000000..4843dfb25
Binary files /dev/null and b/docs/assets/images/screenshots/spirited-ds/game2.png differ
diff --git a/docs/assets/images/screenshots/spirited-ds/menu.png b/docs/assets/images/screenshots/spirited-ds/menu.png
new file mode 100644
index 000000000..a7c0be44f
Binary files /dev/null and b/docs/assets/images/screenshots/spirited-ds/menu.png differ
diff --git a/source/apps/3ds-vjoy-controller.json b/source/apps/3ds-vjoy-controller.json
new file mode 100644
index 000000000..e1669d0d9
--- /dev/null
+++ b/source/apps/3ds-vjoy-controller.json
@@ -0,0 +1,14 @@
+{
+	"github": "StringJan/3ds-vJoy-controller",
+	"title": "3DS vJoy Controller",
+	"systems": [
+		"3DS"
+	],
+	"categories": [
+		"utility"
+	],
+	"author": "memeToasty, StringJan",
+	"description": "Use your 3DS as a vJoy controller for your PC",
+	"long_description": "With this, you can use one or more 3DS consoles as a single, coherent controller on your PC.\n\nUseful if u need a button box or something like that.\n\nVisit the [repo](https://github.com/StringJan/3ds-vJoy-controller) for more info on how to use it.",
+	"script_message": "Please visit https://github.com/StringJan/3ds-vJoy-controller to get started"
+}
diff --git a/source/apps/3dweb.json b/source/apps/3dweb.json
new file mode 100644
index 000000000..06772390c
--- /dev/null
+++ b/source/apps/3dweb.json
@@ -0,0 +1,16 @@
+{
+	"github": "WLHQ/3DWEB",
+	"systems": [
+		"3DS"
+	],
+	"unique_ids": [
+		30024
+	],
+	"categories": [
+		"utility"
+	],
+	"description": "A web server made in C for the 3DS.",
+	"long_description": "A flexible web server that can handle sd card file reads, crypto operations, system requests and raw memory operations.",
+	"image": "https://raw.githubusercontent.com/WLHQ/3DWEB/main/resources/banner.png",
+	"icon": "https://raw.githubusercontent.com/WLHQ/3DWEB/main/resources/icon.png"
+}
diff --git a/source/apps/breakup-simulator-portable.json b/source/apps/breakup-simulator-portable.json
new file mode 100644
index 000000000..9873600c7
--- /dev/null
+++ b/source/apps/breakup-simulator-portable.json
@@ -0,0 +1,37 @@
+{
+	"github": "Dangerbites/BreakupSimulator3DS",
+	"title": "Breakup Simulator Portable",
+	"systems": [
+		"3DS"
+	],
+	"categories": [
+		"game"
+	],
+	"description": "Port of Super Kawai Breakup Sim for the Nintendo 3DS",
+	"long_description": "In this dating game you need to break up with Cat Grill as soon as possible!! Make decisions to get the emotion meter down before the timer gets to 0!\n\nThis port features more endings and a completely portable Breakup Sim experience!!\n\n-- Credits -- ---------------------------\n\nCAT GRILL by DangerBites\n\nDrawing Cat Grill holds up is by Eran\n\nArt and Music by Dangerbites and Haynster",
+	"image": "https://raw.githubusercontent.com/Dangerbites/BreakupSimulator3DS/main/breakup-banner.png",
+	"icon": "https://raw.githubusercontent.com/Dangerbites/BreakupSimulator3DS/main/breakup-icon.png",
+	"scripts": {
+		"Install game (3dsx)": [
+			{
+				"type": "mkdir",
+				"directory": "sdmc:/3ds/BreakupSimulator/"
+			},
+			{
+				"type": "downloadFile",
+				"file": "https://github.com/Dangerbites/BreakupSimulator3DS/releases/download/Major/BreakupSimulator3DS.zip",
+				"output": "sdmc:/3ds/BreakupSimulator3DS.zip"
+			},
+			{
+				"type": "extractFile",
+				"file": "sdmc:/3ds/BreakupSimulator3DS.zip",
+				"input": "",
+				"output": "sdmc:/3ds/BreakupSimulator/"
+			},
+			{
+				"type": "deleteFile",
+				"file": "sdmc:/3ds/BreakupSimulator3DS.zip"
+			}
+		]
+	}
+}
diff --git a/source/apps/bullets.json b/source/apps/bullets.json
new file mode 100644
index 000000000..f36b29de5
--- /dev/null
+++ b/source/apps/bullets.json
@@ -0,0 +1,19 @@
+{
+	"github": "1Setherson1/Bullets",
+	"systems": [
+		"3DS"
+	],
+	"categories": [
+		"game"
+	],
+	"author": "Sethamphetamine",
+	"description": "Dodge and weave!",
+	"long_description": "Bullets is a very simple and lightweight game for the nintendo 3ds. i made bullets to challenge myself to make a game with no game engine. Dpad to controll player. Start to exit (takes a couple seconds)",
+	"image": "https://camo.githubusercontent.com/68de0e6a18922b185a7489a6ed36a208872696c5804b8c7cb5fdde92995f558f/68747470733a2f2f692e6962622e636f2f5a5754706471442f4e65772d50726f6a6563742d312e706e67",
+	"icon": "https://camo.githubusercontent.com/8f6228a1f9c611793017c9adb582554afbe56164dab594bc9c15e4d22b0fc374/68747470733a2f2f692e6962622e636f2f5968585270504e2f4e65772d50726f6a6563742d322e706e67",
+	"downloads": {
+		"Bullets.3dsx": {
+			"url": "https://raw.githubusercontent.com/1Setherson1/Bullets/main/Bullets/Bullets.3dsx"
+		}
+	}
+}
diff --git a/source/apps/citrahold.json b/source/apps/citrahold.json
new file mode 100644
index 000000000..388c9055c
--- /dev/null
+++ b/source/apps/citrahold.json
@@ -0,0 +1,19 @@
+{
+	"github": "regimensocial/Citrahold-3DS",
+	"systems": [
+		"3DS"
+	],
+	"unique_ids": [
+		1045502
+	],
+	"categories": [
+		"utility",
+		"save-tool"
+	],
+	"author": "Jamie Adams, regimensocial",
+	"description": "Citrahold allows you to sync saves between Citra and your 3DS",
+	"long_description": "Citrahold provides you with everything you need to easily move game saves from a physical 3DS to a 3DS emulator on your computer (and vice versa).\n\nIt basically allows you to cloud-sync your saves for if you like to play a game across a real 3DS and an emulator.\n\nPlease visit [the website](https://www.citrahold.com/) for much more information! It has everything you need in order to set it up.\n\nCheckpoint (or another competent save manager) and an Internet connection are also required.",
+	"image": "https://raw.githubusercontent.com/regimensocial/Citrahold-3DS/main/assets/banner.png",
+	"icon": "https://raw.githubusercontent.com/regimensocial/Citrahold-3DS/main/assets/icon.png",
+	"script_message": "Please visit https://www.citrahold.com/ to get set-up"
+}
diff --git a/source/apps/cro-mag-rally.json b/source/apps/cro-mag-rally.json
index e3ed7dcaf..3033acb09 100644
--- a/source/apps/cro-mag-rally.json
+++ b/source/apps/cro-mag-rally.json
@@ -5,5 +5,5 @@
 	"image": "https://raw.githubusercontent.com/fordcars/CroMagRally/3ds-support/docs/3ds_race.png",
 	"icon": "https://raw.githubusercontent.com/fordcars/CroMagRally/3ds-support/packaging/io.jor.cromagrally-alternateicon.png",
 	"categories": ["game"],
-	"long_description": "## *The wildest racing game since man invented the wheel!*\n\nThis is a port of Pangea Software’s racing game **Cro-Mag Rally** to the Nintendo 3DS, based off [Jorio's amazing port](https://github.com/jorio/CroMagRally). It is a fun, retro Mario Kart-style racing game.\n\n## About Cro-Mag Rally\n\nIn Cro-Mag Rally you are a speed-hungry caveman named Brog who races through the Stone, Bronze, and Iron Ages in primitive vehicles such as the Geode Cruiser, Bone Buggy, Logmobile, Trojan Horse, and many others. Brog has at his disposal an arsenal of primitive weaponry ranging from Bone Bombs to Chinese Bottle Rockets and Heat Seeking Homing Pigeons.\n\nCMR was released in 2000 by Pangea Software as a Mac exclusive, and it was a pack-in game on Macs that came out around that time.\n\n## Nintendo 3DS Controls\n* D-Pad: navigate menus\n* A: forward\n* B: reverse\n* X: look behind\n* Y: brake\n* L-Shoulder: throw backwards\n* R-Shoulder: throw forwards\n* Select: change camera\n* Start: pause\n\n## About this port\n\nThis is a port of the original OS 9 version of the game. It aims to provide the best way to experience CMR on today’s computers. It is an “enhanced” version insofar as it fixes bugs that may hinder the experience, and it brings in a few new features in keeping with the spirit of the original game.\n\n### Legal info\n\nCro-Mag Rally © 2000 Pangea Software, Inc. Cro-Mag Rally is a trademark of Pangea Software, Inc. This version was made and re-released here (https://github.com/jorio/CroMagRally) under permission from Pangea Software, Inc.\n\nThis version is licensed under [CC-BY-NC SA 4.0](LICENSE.md)."
-}
\ No newline at end of file
+	"long_description": "## *The wildest racing game since man invented the wheel!*\n\nThis is a port of Pangea Software’s racing game **Cro-Mag Rally** to the Nintendo 3DS, based off [Jorio's amazing port](https://github.com/jorio/CroMagRally). It is a fun, retro Mario Kart-style racing game.\n\n## About Cro-Mag Rally\n\nIn Cro-Mag Rally you are a speed-hungry caveman named Brog who races through the Stone, Bronze, and Iron Ages in primitive vehicles such as the Geode Cruiser, Bone Buggy, Logmobile, Trojan Horse, and many others. Brog has at his disposal an arsenal of primitive weaponry ranging from Bone Bombs to Chinese Bottle Rockets and Heat Seeking Homing Pigeons.\n\nCMR was released in 2000 by Pangea Software as a Mac exclusive, and it was a pack-in game on Macs that came out around that time.\n\n## Nintendo 3DS Controls\n* D-Pad: navigate menus\n* A: forward\n* B: reverse\n* X: look behind\n* Y: brake\n* L-Shoulder: throw backwards\n* R-Shoulder: throw forwards\n* Select: change camera\n* Start: pause\n\n## About this port\n\nThis is a port of the original OS 9 version of the game. It aims to provide the best way to experience CMR on today’s computers. It is an \"enhanced\" version insofar as it fixes bugs that may hinder the experience, and it brings in a few new features in keeping with the spirit of the original game.\n\n### Legal info\n\nCro-Mag Rally © 2000 Pangea Software, Inc. Cro-Mag Rally is a trademark of Pangea Software, Inc. This version was made and re-released here (https://github.com/jorio/CroMagRally) under permission from Pangea Software, Inc.\n\nThis version is licensed under [CC-BY-NC SA 4.0](LICENSE.md)."
+}
diff --git a/source/apps/ctrrgbpat2.json b/source/apps/ctrrgbpat2.json
index b77624115..6656c03d9 100644
--- a/source/apps/ctrrgbpat2.json
+++ b/source/apps/ctrrgbpat2.json
@@ -10,9 +10,9 @@
 		"utility"
 	],
 	"author": "CPunch & Golem64",
-	"description": "LED color and pattern modifier for (n)3DS/2DS. Customize your notifications however you want !",
+	"description": "LED color and pattern modifier for 3DS. Customize your notifications however you want !",
 	"long_description": "# CtrRGBPAT2\nThis 3DS application allows the LED color to be changed. In order for this to work, Luma CFW (custom firmware) needs to be installed.\nThanks to [CPunch](https://github.com/CPunch/CtrRGBPATTY/) for the original project !\n\n## Features\nCustomize the LED color and pattern for when you receive notifications ! Whether SpotPass, StreetPass, online Friends, or more (Yes, there's more) ! Why keep the default blue when you can have a cool-looking purple for example 😎\n\nEverything is simple and made so you cannot possibly screw something up (or else you really wanted to)\n\n## Upcoming\n- Save and restore feature\n- Proper UI ?\n\nHope you enjoy ! :)",
 	"image": "https://raw.githubusercontent.com/Golem642/CtrRGBPAT2/master/resources/banner.png",
 	"icon": "https://raw.githubusercontent.com/Golem642/CtrRGBPAT2/master/resources/icon.png",
 	"script_message": "You will need to have \"Game Patching\" and \"Loading external FIRMs and modules\"\nenabled in LumaCFW settings (hold select on boot)"
-}
\ No newline at end of file
+}
diff --git a/source/apps/ds-forwarder-packs.json b/source/apps/ds-forwarder-packs.json
index 668f4a149..6da78cf48 100644
--- a/source/apps/ds-forwarder-packs.json
+++ b/source/apps/ds-forwarder-packs.json
@@ -9,7 +9,7 @@
 	"categories": [
 		"utility"
 	],
-	"icon": "https://raw.githubusercontent.com/RocketRobz/NTR_Forwarder/forwarder/SD%20Card/sd/icon.bmp",
+	"icon": "https://raw.githubusercontent.com/RocketRobz/NTR_Forwarder/forwarder/SD_Card/sd/icon.bmp",
 	"downloads": {
 		"DS.Game.Forwarder.pack.nds-bootstrap.7z": {
 			"size": 473415,
@@ -46,4 +46,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/source/apps/fmsx3ds.json b/source/apps/fmsx3ds.json
new file mode 100644
index 000000000..21ebfc314
--- /dev/null
+++ b/source/apps/fmsx3ds.json
@@ -0,0 +1,17 @@
+{
+	"github": "TomiokaH01/fMSX3DS",
+	"systems": [
+		"3DS"
+	],
+	"unique_ids": [
+		472804
+	],
+	"categories": [
+		"emulator"
+	],
+	"author": "h.tomioka",
+	"description": "fMSX(MSX emulator) port to 3DS. Add many new feature such as MSXTurboR emulation and MSX0 emulation.",
+	"long_description": "fMSX(MSX emulator) port to 3DS. Add new feature such as MSXTurboR emulation and MSX0 emulation.\nAlso, it add various improvements based on recently analize of MSX hardware\ninclude analize in Japan that is unknown in world wide.",
+	"image": "https://private-user-images.githubusercontent.com/168841671/331778903-f7ffcd0d-c1e9-4db4-a4ee-03b29ebc79b5.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjM0MTcyNDAsIm5iZiI6MTcyMzQxNjk0MCwicGF0aCI6Ii8xNjg4NDE2NzEvMzMxNzc4OTAzLWY3ZmZjZDBkLWMxZTktNGRiNC1hNGVlLTAzYjI5ZWJjNzliNS5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwODExJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDgxMVQyMjU1NDBaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT03ZjA3MjE1NGNhZTM1NmNjODQyOWI0NTU3ZGZmZjM4YzdiNzQyYzVlYTFjYjYwYzJjMzllZmIxZjIwZDlmN2M0JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.hTvWFkt8-Lo3mxlhW7mNxgO6H6uXSIf_B7dfbUojzEc",
+	"icon": "https://raw.githubusercontent.com/TomiokaH01/fMSX3DS/main/icon.png"
+}
diff --git a/source/apps/mars3ds.json b/source/apps/mars3ds.json
new file mode 100644
index 000000000..3f9879de2
--- /dev/null
+++ b/source/apps/mars3ds.json
@@ -0,0 +1,18 @@
+{
+	"github": "BotRandomness/Mars3DS",
+	"title": "Mars",
+	"systems": [
+		"3DS"
+	],
+	"categories": [
+		"game"
+	],
+	"unique-ids": [
+		8993
+	],
+	"author": "Bot Studio",
+	"description": "Mars3DS, a lost retro shooter ;)",
+	"long_description": "# Mars3DS!\n_A lost retro shooter ;)_\n## Welcome to Mars!\nPlay as Astro, collect the valuable mushrooms, and shoot down the Parasites!\n## Controls\n(+) or CirclePad to move\n(A) to shoot\n(B) to jump\n## Notes\n**Check out the github for more technical details: https://github.com/BotRandomness/Mars3DS**\n**Enjoy! :)**",
+	"image": "https://raw.githubusercontent.com/BotRandomness/Mars3DS/master/git-res/logo.png",
+	"icon": "https://raw.githubusercontent.com/BotRandomness/Mars3DS/master/icon.png"
+}
diff --git a/source/apps/nfcheckrem.json b/source/apps/nfcheckrem.json
new file mode 100644
index 000000000..211dabe1a
--- /dev/null
+++ b/source/apps/nfcheckrem.json
@@ -0,0 +1,30 @@
+{
+	"github": "Golem642/NFCheckRem",
+	"systems": [
+		"3DS"
+	],
+	"categories": [
+		"utility"
+	],
+	"author": "Golem64",
+	"description": "Patch for Nintendo consoles to remove the read-only check on amiibos and allow for rewritable Ntag215 NFC tags",
+	"long_description": "Patch for Nintendo consoles to remove the read-only check on amiibos and allow for rewritable Ntag215 NFC tags\n# Installation\n- Nintendo 3DS : Ensure you have the latest [Luma3DS](https://github.com/LumaTeam/Luma3DS/) version, then go into the folder corresponding to your console and download the .ips file. \nPut this file into your SD card in the following folder : `/luma/sysmodules/` then ensure you have \"Enable loading external FIRMs and modules\" and \"Enable game patching\" enabled in the Luma3DS settings (hold SELECT on boot)\n- Wii U : (not yet implemented)\n- Switch : (not yet implemented)\n### Note for 3DS users\nThe patch will do nothing if wumiibo is enabled, ensure wumiibo is disabled before attempting to scan any Amiibo or NFC tag\n# Why ?\nWhen writing an Amiibo to a blank Ntag215 NFC tag with an app such as [TagMo](https://github.com/HiddenRamblings/TagMo), the tag will become read-only on some parts of the data.\n\nThis data includes the Amiibo game character id, variant, figure type, model number and series.\n\nThis means that if it's read-only, you cannot change the figure stored on the NFC tag, which therefore mean having to buy multiple tags for every Amiibo you want.\n# Can't I just use Wumiibo/re_nfpii ?\nWell yes but sometimes games won't like when you open their menu and give you intense lag until you restart it, making those amiibo emulation apps unusable on those games.\n\nMoreover, this solution will give you the possibility to have physical tags, so you get the original experience with a few more features + you can easily share it with others as long as they have the patch too\n# What does this do ?\nThis modifies the NFC system module to disable the checks that are made on those areas, yes the console checks if the tag is read-only.\n\nBy disabling these checks, this means you can have write-enabled tags and they would still work on consoles with the patch installed\n\nAnd thus, you can reuse your tag forever without being constrained to have it as one specific Amiibo (you still have to rewrite it every time you want to change it)\n# Technical details\nSee the [GitHub repository](https://github.com/Golem642/NFCheckRem)",
+	"icon": "https://raw.githubusercontent.com/Golem642/NFCheckRem/main/NFCheckRem.png",
+	"script_message": "You will need to have \"Game Patching\" and \"Loading external FIRMs and modules\"\nenabled in LumaCFW settings (hold select on boot)",
+	"scripts": {
+		"Old 3DS and Old 2DS": [
+			{
+				"type": "downloadFile",
+				"file": "https://raw.githubusercontent.com/Golem642/NFCheckRem/main/Old%203DS%20and%20Old%202DS/0004013000004002.ips",
+				"output": "sdmc:/luma/sysmodules/0004013000004002.ips"
+			}
+		],
+	"New 3DS and New 2DS": [
+			{
+				"type": "downloadFile",
+				"file": "https://raw.githubusercontent.com/Golem642/NFCheckRem/main/New%203DS%20and%20New%202DS/0004013000004002.ips",
+				"output": "sdmc:/luma/sysmodules/0004013000004002.ips"
+			}
+		]
+	}
+}
diff --git a/source/apps/off.json b/source/apps/off.json
index 6653d2834..7dceb1516 100644
--- a/source/apps/off.json
+++ b/source/apps/off.json
@@ -6,5 +6,5 @@
 	"icon": "https://raw.githubusercontent.com/fauxfennec/OFF3DS/main/icon.png",
 	"categories": ["game"],
 	"unique_ids": [986895],
-	"long_description": "A 3DS port of **OFF,** the cult classic 2008 surrealist RPG by Mortis Ghost. Built via [Easy3DS.](https://github.com/msikma/Easy3DS)\n\n**This is based on the [v2.0 English translation by RecDra!](https://forum.starmen.net/forum/Fan/Games/OFF-by-Mortis-Ghost/page/3#post1907821)**\n\nI own nothing - this is strictly an unofficial fan project to help spread the word about this amazing game!\n**All rights belong to Mortis Ghost (Martin Georis), Alias Conrad Coldwood, & the Unproductive Fun Time team.**\n\n# Warning: Exiting the game\nWhen you want to quit, please do so via the \"quit\" option from the ingame menu, rather than closing the app directly from the 3DS homescreen!! Due to an error with the EasyRPG player, the latter method shuts down all processes and requires you to reboot your console, which is just really annoying (⁠-⁠_⁠-⁠;⁠)"
+	"long_description": "A 3DS port of **OFF,** the cult classic 2008 surrealist RPG by Mortis Ghost. Built via [Easy3DS.](https://github.com/msikma/Easy3DS)\n\n**This is based on the [v2.0 English translation by RecDra!](https://forum.starmen.net/forum/Fan/Games/OFF-by-Mortis-Ghost/page/3#post1907821)**\n\nI own nothing - this is strictly an unofficial fan project to help spread the word about this amazing game!\n**All rights belong to Mortis Ghost (Martin Georis), Alias Conrad Coldwood, & the Unproductive Fun Time team.**\n\n# Warning: Exiting the game\nWhen you want to quit, please do so via the \"quit\" option from the ingame menu, rather than closing the app directly from the 3DS homescreen!! Due to an error with the EasyRPG player, the latter method shuts down all processes and requires you to reboot your console, which is just really annoying (-_-;)"
 }
diff --git a/source/apps/pie3ds.json b/source/apps/pie3ds.json
new file mode 100644
index 000000000..2c1f2fbb8
--- /dev/null
+++ b/source/apps/pie3ds.json
@@ -0,0 +1,13 @@
+{
+	"github": "amedeo463/pie3ds",
+	"title": "Pie3DS",
+	"systems": [
+		"3DS"
+	],
+	"categories": [
+		"utility"
+	],
+	"description": "A simple application that calculates Pi",
+	"long_description": "Pie3DS - a simple application that calculates Pi.\n\nWritten in C with VS code\n\nCompiled with devkitPro\n\ndebugged thanks to Docker",
+	"icon": "https://raw.githubusercontent.com/amedeo463/pie3ds/main/icon.png"
+}
diff --git a/source/apps/retroarch.json b/source/apps/retroarch.json
new file mode 100644
index 000000000..96e2a2427
--- /dev/null
+++ b/source/apps/retroarch.json
@@ -0,0 +1,110 @@
+{
+	"github": "libretro/RetroArch",
+	"systems": ["3DS"],
+	"categories": ["emulator"],
+	"unique_ids": [764928],
+	"icon": "https://raw.githubusercontent.com/libretro/RetroArch/master/pkg/ctr/assets/default.png",
+	"image": "https://raw.githubusercontent.com/libretro/RetroArch/master/pkg/ctr/assets/libretro_banner.png",
+	"download_page": "f\"https://buildbot.libretro.com/stable/{app['version'][1:]}/nintendo/3ds\"",
+	"eval_notes_md": true,
+	"update_notes_md": "next(iter(re.findall(f\"# {app['version'][1:]}\\\\n+(.*?)\\\\n+#\", requests.get('https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md').text, re.DOTALL)), '')",
+	"eval_downloads": true,
+	"downloads": {
+		"RetroArch_3dsx.7z": {
+			"url": "f\"https://buildbot.libretro.com/stable/{app['version'][1:]}/nintendo/3ds/RetroArch_3dsx.7z\"",
+			"size": null
+		},
+		"RetroArch_cia.7z": {
+			"url": "f\"https://buildbot.libretro.com/stable/{app['version'][1:]}/nintendo/3ds/RetroArch_cia.7z\"",
+			"size": null
+		}
+	},
+	"nightly": {
+		"download_page": "https://buildbot.libretro.com/nightly/nintendo/3ds/",
+		"downloads": {
+			"RetroArch_cia.7x": {
+				"url": "https://buildbot.libretro.com/nightly/nintendo/3ds/RetroArch_cia.7z"
+			},
+			"RetroArch_3dsx.7z": {
+				"url": "https://buildbot.libretro.com/nightly/nintendo/3ds/RetroArch_3dsx.7z"
+			}
+		}
+	},
+	"scripts": {
+		"Core info files": [
+			{
+				"type": "downloadFile",
+				"file": "https://buildbot.libretro.com/assets/frontend/info.zip",
+				"output": "/info.zip"
+			},
+			{
+				"type": "extractFile",
+				"file": "/info.zip",
+				"input": "",
+				"output": "retroarch/media/"
+			},
+			{
+				"type": "deleteFile",
+				"file": "/info.zip"
+			}
+		],
+		"bottom_menu.png": [
+			{
+				"type": "downloadFile",
+				"file": "https://raw.githubusercontent.com/libretro/retroarch-assets/master/ctr/bottom_menu.png",
+				"output": "/retroarch/assets/ctr/bottom_menu.png"
+			}
+		],
+		"[optional] Assets": [
+			{
+				"type": "downloadFile",
+				"file": "https://buildbot.libretro.com/assets/frontend/assets.zip",
+				"output": "/assets.zip"
+			},
+			{
+				"type": "extractFile",
+				"file": "/assets.zip",
+				"input": "",
+				"output": "retroarch/assets/"
+			},
+			{
+				"type": "deleteFile",
+				"file": "/assets.zip"
+			}
+		],
+		"[optional] Overlays": [
+			{
+				"type": "downloadFile",
+				"file": "https://buildbot.libretro.com/assets/frontend/overlays.zip",
+				"output": "/overlays.zip"
+			},
+			{
+				"type": "extractFile",
+				"file": "/overlays.zip",
+				"input": "",
+				"output": "retroarch/overlays/"
+			},
+			{
+				"type": "deleteFile",
+				"file": "/overlays.zip"
+			}
+		],
+		"[optional] Database files": [
+			{
+				"type": "downloadFile",
+				"file": "https://buildbot.libretro.com/assets/frontend/database-rdb.zip",
+				"output": "/database-rdb.zip"
+			},
+			{
+				"type": "extractFile",
+				"file": "/database-rdb.zip",
+				"input": "",
+				"output": "retroarch/database/rdb/"
+			},
+			{
+				"type": "deleteFile",
+				"file": "/database-rdb.zip"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/source/apps/scummvm.json b/source/apps/scummvm.json
new file mode 100644
index 000000000..0ff5e6ebf
--- /dev/null
+++ b/source/apps/scummvm.json
@@ -0,0 +1,67 @@
+{
+	"github": "scummvm/scummvm",
+	"systems": ["3DS", "DS"],
+	"categories": ["emulator"],
+	"unique_ids": [1045281],
+	"description": "Point-and-click adventure game engines",
+	"long_description": "ScummVM allows you to play classic graphic point-and-click adventure games, text adventure games, and RPGs, as long as you already have the game data files. ScummVM replaces the executable files shipped with the games, which means you can now play your favorite games on all your favorite devices.\n\nWhile ScummVM was originally designed to run LucasArts’ SCUMM games, over time support has been added for many other games: see the full list [on our wiki](https://wiki.scummvm.org/index.php?title=Category:Supported_Games). Noteworthy titles include Broken Sword, Myst and Blade Runner, although there are countless other hidden gems to explore.",
+	"icon": "https://raw.githubusercontent.com/scummvm/scummvm/master/backends/platform/3ds/app/icon.png",
+	"image": "https://raw.githubusercontent.com/scummvm/scummvm/master/backends/platform/3ds/app/banner.png",
+	"download_page": "f\"https://www.scummvm.org/downloads/\"",
+	"eval_downloads": true,
+	"downloads": {
+		"scummvm-3dsx.zip": {
+			"url": "f\"https://downloads.scummvm.org/frs/scummvm/{app['version'][1:]}/scummvm-{app['version'][1:]}-3ds-3dsx.zip\"",
+			"size": null
+		},
+		"scummvm-cia.zip": {
+			"url": "f\"https://downloads.scummvm.org/frs/scummvm/{app['version'][1:]}/scummvm-{app['version'][1:]}-3ds-cia.zip\"",
+			"size": null
+		},
+		"scummvm-ds.zip": {
+			"url": "f\"https://downloads.scummvm.org/frs/scummvm/{app['version'][1:]}/scummvm-{app['version'][1:]}-ds.zip\"",
+			"size": null
+		}
+	},
+	"nightly": {
+		"download_page": "https://buildbot.scummvm.org/dailybuilds/master/",
+		"downloads": {
+			"3ds-master-latest.zip": {
+				"url": "https://buildbot.scummvm.org/dailybuilds/master/3ds-master-latest.zip"
+			},
+			"nds-master-latest.zip": {
+				"url": "https://buildbot.scummvm.org/dailybuilds/master/nds-master-latest.zip"
+			}
+		}
+	},
+	"archive": {
+		"scummvm-.*-3ds-3dsx.zip": {
+			"scummvm.3dsx": [
+				"scummvm.3dsx"
+			]
+		},
+		"scummvm-.*-3ds-cia.zip": {
+			"scummvm.cia": [
+				"scummvm.cia"
+			]
+		},
+		"scummvm-.*-ds.zip": {
+			"scummvm.nds": [
+				"scummvm.nds"
+			]
+		},
+		"3ds-master-latest.zip": {
+			"scummvm.3dsx": [
+				"3ds-master-.{8}/scummvm.3dsx"
+			],
+			"scummvm.cia": [
+				"3ds-master-.{8}/scummvm.cia"
+			]
+		},
+		"nds-master-latest.zip": {
+			"scummvm.nds": [
+				"nds-master-.{8}/scummvm.ds"
+			]
+		}
+	}
+}
diff --git a/source/apps/shut-the-cam-up.json b/source/apps/shut-the-cam-up.json
index 819c1fa72..39a7c2b45 100644
--- a/source/apps/shut-the-cam-up.json
+++ b/source/apps/shut-the-cam-up.json
@@ -9,7 +9,6 @@
 	],
 	"description": "Removes the camera shutter and high-pitched beep sound from the Nintendo 3DS (works on all 3ds apps that use the camera)",
 	"long_description": "# DISCLAIMER\nI do not condone any misuses of this patch for malicious purposes or whatever.\n\n# Why tho?\nImagine you are playing your 3ds in a cafe or smt, you need to use the camera feature in some game (for example. Face Raiders) and suddenly the shutter sound bursts out of the speakers and people look at you weirdly, we wouldnt want that. \n\nAlso like... phones don't do that sort of thing (well maybe in japan, china cause there the law demands that anything with a camera has to have a shutter sound)\n\nI mostly created this patch cause i like the vibe of vlogging with a 3ds. It has its charm you know.\n\n# How is it possible?!\nThe shutter sound was embedded in some system process, we just discovered it now lol. So i just decided to null the bytes with audio data, and it worked!\n\n# Does it work on both Old and New 3DS?\nYup. there are two seperate patches individually for the new and old model of the console.",
-	"icon": "https://cdn.discordapp.com/attachments/1146918310072549386/1146918328389087312/ikonka2.png",
 	"scripts": {
 		"Install the patch (Old 3DS/2DS)": [
 			{
@@ -54,4 +53,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/source/apps/spirited-ds.json b/source/apps/spirited-ds.json
new file mode 100644
index 000000000..266f42724
--- /dev/null
+++ b/source/apps/spirited-ds.json
@@ -0,0 +1,13 @@
+{
+	"github": "KahnerC/SpiritedDS",
+	"systems": [
+		"DS"
+	],
+	"categories": [
+		"game"
+	],
+	"description": "An uninspired card game for the Nintendo DS.",
+	"long_description": "Spirited was a series about a rock star ghost who falls in love with an Australian dentist, fresh from the golden age of mad-lib television. Outside of a spartan DVD release, the series produced no merchandise...\n\nUntil now.\n\nToday, I introduce you to Spirited DS, a barebones implementation of how I assume Top Trumps works, featuring 64x64 headshots of beloved Spirited characters, on the Nintendo DS. See how I feel these characters rate in 5 absolutely subjective qualities.\n\nDoes it fall under fair use? Who knows? But I don't think I'm causing much damage to a thirteen year old series on a sub-240p display, even if there are two of them.\n\nThe game is provided as a .nds file, suitable for a flashcart, modded 3DS, or emulator of your choice.\n\nTragically, there is no sound. Anyone who can help with that probably has better things to do.\n\nBuilt with NightFoxLib (which feeds off of DevKitPro, LibNDS). Code was written in C++ in Notepad. Python was used to test some logic, and to process pictures from Krita.\n\nBasic rules are: You pick one of five qualities listed on your card. If your value is bigger than your opponent's you win their card, and both cards go to the bottom of your deck. Lose, and it's your opponent's turn. They play by the same rules, and the game ends when one player has no more cards. It was primitive and dated even by late-seventies standards.",
+	"image": "https://raw.githubusercontent.com/KahnerC/SpiritedDS/main/banner.png",
+	"icon": "https://raw.githubusercontent.com/KahnerC/SpiritedDS/main/icon.png"
+}
diff --git a/source/apps/tjaplayer_for_3ds.json b/source/apps/tjaplayer_for_3ds.json
index b670ab834..ab28264f2 100644
--- a/source/apps/tjaplayer_for_3ds.json
+++ b/source/apps/tjaplayer_for_3ds.json
@@ -1,5 +1,5 @@
 {
-	"github": "togetg/TJAPlayer_for_3DS",
+	"github": "LuMariGames/TJAP_3DS",
 	"systems": [
 		"3DS"
 	],
@@ -9,6 +9,9 @@
 	"unique_ids": [
 		751189
 	],
+	"author": "TogeToge & MarioGames",
+	"description": "TJAPlayer for 3DS - Music game of the TJA file.",
+	"long_description": "TJAPlayer for 3DSを約2年ぶりにTogeToge公認の上、更新しました。\nThis software is produced under the official authorization of TogeToge.\n\n・太鼓タワーと段位道場の実装\n・一部オプションの追加\n・その他一部の不具合修正\n\n・Implementation of Taiko Tower and Rank Dojo\n・Addition of some options\n・FIXES OF OTHER FAILURE",
 	"image": "https://raw.githubusercontent.com/togetg/TJAPlayer_for_3DS/master/resource/banner.png",
-	"icon": "https://raw.githubusercontent.com/togetg/TJAPlayer_for_3DS/master/resource/icon.png"
-}
\ No newline at end of file
+	"icon": "https://raw.githubusercontent.com/LuMariGames/TJAP_3DS/main/resource/icon.png"
+}