diff --git a/romfs/lang/en/app.json b/romfs/lang/en/app.json
index 59f34b9..8a3a249 100644
--- a/romfs/lang/en/app.json
+++ b/romfs/lang/en/app.json
@@ -10,7 +10,7 @@
 	"ARGUMENT_INVALID": "Argument invalid.\nPlease check the xml file for proper arguments.",
 	"AUTHOR": "Author",
 	"AUTO_UPDATE_NIGHTLY": "Use nightly versions",
-	"AUTO_UPDATE_NIGHTLY_DESC": "Use nightly versions of Universal-Updater instead of the stable releases.",
+	"AUTO_UPDATE_NIGHTLY_DESC": "Use nightly versions of DarkStore instead of the stable releases.",
 	"AUTO_UPDATE_SETTINGS": "Auto-Update Settings",
 	"AUTO_UPDATE_SETTINGS_BTN": "Auto-update settings...",
 	"AUTO_UPDATE_STORE": "Auto-update Stores",
diff --git a/source/menu/settings.cpp b/source/menu/settings.cpp
index 9d488dc..7ecdf3d 100644
--- a/source/menu/settings.cpp
+++ b/source/menu/settings.cpp
@@ -593,7 +593,7 @@ static void LanguageLogic(int &page, int &selection, int &sPos) {
 		/* Check if language needs a custom font. */
 		if (l == "uk") {
 			if (access("sdmc:/3ds/DarkStore/font.bcfnt", F_OK) != 0) {
-				ScriptUtils::downloadFile("https://github.com/Universal-Team/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/DarkStore/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true);
+				ScriptUtils::downloadFile("https://github.com/DarkStore-3DS/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/DarkStore/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true);
 				Init::UnloadFont();
 			}
 
@@ -627,7 +627,7 @@ static void LanguageLogic(int &page, int &selection, int &sPos) {
 					/* Check if language needs a custom font. */
 					if (l == "uk") {
 						if (access("sdmc:/3ds/DarkStore/font.bcfnt", F_OK) != 0) {
-							ScriptUtils::downloadFile("https://github.com/Universal-Team/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/DarkStore/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true);
+							ScriptUtils::downloadFile("https://github.com/DarkStore-3DS/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/DarkStore/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true);
 							Init::UnloadFont();
 						}
 
@@ -658,7 +658,7 @@ static void LanguageLogic(int &page, int &selection, int &sPos) {
 
 		if (touching(touch, langButtons[6])) {
 			/* Download Font. */
-			ScriptUtils::downloadFile("https://github.com/Universal-Team/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/DarkStore/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true);
+			ScriptUtils::downloadFile("https://github.com/DarkStore-3DS/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/DarkStore/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true);
 			config->customfont(true);
 			Init::UnloadFont();
 			Init::LoadFont();
diff --git a/source/screens/mainScreen.cpp b/source/screens/mainScreen.cpp
index a806d49..22825f6 100644
--- a/source/screens/mainScreen.cpp
+++ b/source/screens/mainScreen.cpp
@@ -70,7 +70,7 @@ MainScreen::MainScreen() {
 		}
 	}
 
-	/* If Universal DB --> Get! */
+	/* If DarkStore-Homebrew --> Get! */
 	if (config->lastStore() == "darkstore-homebrew.store" || config->lastStore() == "") {
 		if (access("sdmc:/3ds/DarkStore/stores/darkstore-homebrew.store", F_OK) != 0) {
 			if (checkWifiStatus()) {