diff --git a/source/lang/lang.cpp b/source/lang/lang.cpp
index 554a5be..92c2a42 100644
--- a/source/lang/lang.cpp
+++ b/source/lang/lang.cpp
@@ -11,7 +11,7 @@ std::string Lang::get(const std::string &key) {
 	return appJson.at(key).get_ref<const std::string&>();
 }
 
-std::string langs[] = {"br", "de", "en", "es", "fr", "it", "jp", "lt", "pt", "ru"};
+std::string langs[] = {"br", "de", "en", "es", "fr", "it", "lt", "pt", "ru", "jp"};
 
 void Lang::load(int lang) {
 	FILE* values;
diff --git a/source/screens/settings.cpp b/source/screens/settings.cpp
index 59590ff..5e6acdc 100644
--- a/source/screens/settings.cpp
+++ b/source/screens/settings.cpp
@@ -48,133 +48,12 @@ void Settings::DrawLanguageSelection(void) const {
 	Gui::DrawString((400-Gui::GetStringWidth(0.8f, Lang::get("SELECT_LANG")))/2, 2, 0.8f, Config::TxtColor, Lang::get("SELECT_LANG"), 400);
 	Gui::DrawBottom();
 
-	if (Config::lang == 0) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::SelectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
-
-	} else if (Config::lang == 1) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::SelectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
-
-	} else if (Config::lang == 2) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::SelectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
-
-	} else if (Config::lang == 3) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::SelectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
-
-	} else if (Config::lang == 4) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::SelectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
-
-	} else if (Config::lang == 5) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::SelectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
-
-	} else if (Config::lang == 6) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::SelectedColor);
-
-	} else if (Config::lang == 7) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::SelectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
-	} else if (Config::lang == 8) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::SelectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
-	} else if (Config::lang == 9) {
-		Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
-
-		Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
-		Gui::Draw_Rect(177, 152, 20, 20, Config::SelectedColor);
-		Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
+	for (int language = 0; language < 10; language++) {
+		if (Config::lang == language) {
+			Gui::Draw_Rect(langBlocks[language].x, langBlocks[language].y, langBlocks[language].w, langBlocks[language].h, Config::SelectedColor);
+		} else {
+			Gui::Draw_Rect(langBlocks[language].x, langBlocks[language].y, langBlocks[language].w, langBlocks[language].h, Config::UnselectedColor);
+		}
 	}
 
 	Gui::DrawString(langBlocks[0].x+25, langBlocks[0].y, 0.7f, Config::TxtColor, "Bruh", 320);
@@ -261,56 +140,12 @@ void Settings::DrawColorChanging(void) const {
 
 void Settings::LanguageSelection(u32 hDown, touchPosition touch) {
 	if (hDown & KEY_TOUCH) {
-		if (touching(touch, langBlocks[0])) {
-			Config::lang = 0;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-
-		} else if (touching(touch, langBlocks[1])) {
-			Config::lang = 1;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-
-		} else if (touching(touch, langBlocks[2])) {
-			Config::lang = 2;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-
-		} else if (touching(touch, langBlocks[3])) {
-			Config::lang = 3;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-
-		} else if (touching(touch, langBlocks[4])) {
-			Config::lang = 4;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-
-
-
-		} else if (touching(touch, langBlocks[5])) {
-			Config::lang = 5;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-
-		} else if (touching(touch, langBlocks[6])) {
-			Config::lang = 7;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-
-		} else if (touching(touch, langBlocks[7])) {
-			Config::lang = 8;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-		} else if (touching(touch, langBlocks[8])) {
-			Config::lang = 9;
-			Lang::load(Config::lang);
-			Config::saveConfig();
-
-		} else if (touching(touch, langBlocks[9])) {
-			Config::lang = 6;
-			Lang::load(Config::lang);
-			Config::saveConfig();
+		for (int language = 0; language < 10; language++) {
+			if (touching(touch, langBlocks[language])) {
+				Config::lang = language;
+				Lang::load(Config::lang);
+				Config::saveConfig();
+			}
 		}
 	}